gtk/: fully remove gtkalias hacks
authorJavier Jardón <jjardon@gnome.org>
Fri, 9 Jul 2010 17:22:23 +0000 (19:22 +0200)
committerJavier Jardón <jjardon@gnome.org>
Sat, 10 Jul 2010 00:51:26 +0000 (02:51 +0200)
https://bugzilla.gnome.org/show_bug.cgi?id=623845

245 files changed:
docs/reference/gtk/Makefile.am
gtk/Makefile.am
gtk/aliasfilescheck.sh [deleted file]
gtk/gtkaboutdialog.c
gtk/gtkaccelgroup.c
gtk/gtkaccellabel.c
gtk/gtkaccelmap.c
gtk/gtkaccessible.c
gtk/gtkaction.c
gtk/gtkactiongroup.c
gtk/gtkactivatable.c
gtk/gtkadjustment.c
gtk/gtkalignment.c
gtk/gtkapplication.c
gtk/gtkarrow.c
gtk/gtkaspectframe.c
gtk/gtkassistant.c
gtk/gtkbbox.c
gtk/gtkbin.c
gtk/gtkbindings.c
gtk/gtkbox.c
gtk/gtkbuildable.c
gtk/gtkbuilder.c
gtk/gtkbuilderparser.c
gtk/gtkbutton.c
gtk/gtkcalendar.c
gtk/gtkcelleditable.c
gtk/gtkcelllayout.c
gtk/gtkcellrenderer.c
gtk/gtkcellrendereraccel.c
gtk/gtkcellrenderercombo.c
gtk/gtkcellrendererpixbuf.c
gtk/gtkcellrendererprogress.c
gtk/gtkcellrendererspin.c
gtk/gtkcellrendererspinner.c
gtk/gtkcellrenderertext.c
gtk/gtkcellrenderertoggle.c
gtk/gtkcellview.c
gtk/gtkcheckbutton.c
gtk/gtkcheckmenuitem.c
gtk/gtkclipboard-quartz.c
gtk/gtkclipboard.c
gtk/gtkcolorbutton.c
gtk/gtkcolorsel.c
gtk/gtkcolorseldialog.c
gtk/gtkcombobox.c
gtk/gtkcomboboxentry.c
gtk/gtkcontainer.c
gtk/gtkcustompaperunixdialog.c
gtk/gtkdialog.c
gtk/gtkdnd-quartz.c
gtk/gtkdnd.c
gtk/gtkdrawingarea.c
gtk/gtkeditable.c
gtk/gtkentry.c
gtk/gtkentrybuffer.c
gtk/gtkentrycompletion.c
gtk/gtkeventbox.c
gtk/gtkexpander.c
gtk/gtkfilechooser.c
gtk/gtkfilechooserbutton.c
gtk/gtkfilechooserdefault.c
gtk/gtkfilechooserdialog.c
gtk/gtkfilechooserembed.c
gtk/gtkfilechooserentry.c
gtk/gtkfilechoosersettings.c
gtk/gtkfilechooserutils.c
gtk/gtkfilechooserwidget.c
gtk/gtkfilefilter.c
gtk/gtkfilesystem.c
gtk/gtkfilesystemmodel.c
gtk/gtkfixed.c
gtk/gtkfontbutton.c
gtk/gtkfontsel.c
gtk/gtkframe.c
gtk/gtkgc.c
gtk/gtkhandlebox.c
gtk/gtkhbbox.c
gtk/gtkhbox.c
gtk/gtkhpaned.c
gtk/gtkhruler.c
gtk/gtkhscale.c
gtk/gtkhscrollbar.c
gtk/gtkhseparator.c
gtk/gtkhsv.c
gtk/gtkiconcache.c
gtk/gtkiconfactory.c
gtk/gtkicontheme.c
gtk/gtkiconview.c
gtk/gtkimage.c
gtk/gtkimagemenuitem.c
gtk/gtkimcontext.c
gtk/gtkimcontextsimple.c
gtk/gtkimmodule.c
gtk/gtkimmulticontext.c
gtk/gtkinfobar.c
gtk/gtkinvisible.c
gtk/gtkitem.c
gtk/gtkkeyhash.c
gtk/gtklabel.c
gtk/gtklayout.c
gtk/gtklinkbutton.c
gtk/gtkliststore.c
gtk/gtkmain.c
gtk/gtkmenu.c
gtk/gtkmenubar.c
gtk/gtkmenuitem.c
gtk/gtkmenushell.c
gtk/gtkmenutoolbutton.c
gtk/gtkmessagedialog.c
gtk/gtkmisc.c
gtk/gtkmnemonichash.c
gtk/gtkmodules.c
gtk/gtkmountoperation-x11.c
gtk/gtkmountoperation.c
gtk/gtknotebook.c
gtk/gtkobject.c
gtk/gtkoffscreenwindow.c
gtk/gtkorientable.c
gtk/gtkpagesetup.c
gtk/gtkpagesetupunixdialog.c
gtk/gtkpaned.c
gtk/gtkpapersize.c
gtk/gtkpathbar.c
gtk/gtkplug-stub.c
gtk/gtkplug-win32.c
gtk/gtkplug-x11.c
gtk/gtkplug.c
gtk/gtkprint-win32.c
gtk/gtkprintbackend.c
gtk/gtkprintcontext.c
gtk/gtkprinter.c
gtk/gtkprinteroption.c
gtk/gtkprinteroptionset.c
gtk/gtkprinteroptionwidget.c
gtk/gtkprintjob.c
gtk/gtkprintoperation-unix.c
gtk/gtkprintoperation-win32.c
gtk/gtkprintoperation.c
gtk/gtkprintoperationpreview.c
gtk/gtkprintsettings.c
gtk/gtkprintunixdialog.c
gtk/gtkprintutils.c
gtk/gtkprogressbar.c
gtk/gtkquartz.c
gtk/gtkradioaction.c
gtk/gtkradiobutton.c
gtk/gtkradiomenuitem.c
gtk/gtkradiotoolbutton.c
gtk/gtkrange.c
gtk/gtkrbtree.c
gtk/gtkrc.c
gtk/gtkrecentaction.c
gtk/gtkrecentchooser.c
gtk/gtkrecentchooserdefault.c
gtk/gtkrecentchooserdialog.c
gtk/gtkrecentchoosermenu.c
gtk/gtkrecentchooserutils.c
gtk/gtkrecentchooserwidget.c
gtk/gtkrecentfilter.c
gtk/gtkrecentmanager.c
gtk/gtkruler.c
gtk/gtkscale.c
gtk/gtkscalebutton.c
gtk/gtkscrollbar.c
gtk/gtkscrolledwindow.c
gtk/gtkselection.c
gtk/gtkseparator.c
gtk/gtkseparatormenuitem.c
gtk/gtkseparatortoolitem.c
gtk/gtksettings.c
gtk/gtkshow.c
gtk/gtksizegroup.c
gtk/gtksizerequest.c
gtk/gtksocket-stub.c
gtk/gtksocket-win32.c
gtk/gtksocket-x11.c
gtk/gtksocket.c
gtk/gtkspinbutton.c
gtk/gtkspinner.c
gtk/gtkstatusbar.c
gtk/gtkstatusicon.c
gtk/gtkstock.c
gtk/gtkstyle.c
gtk/gtktable.c
gtk/gtktearoffmenuitem.c
gtk/gtktestutils.c
gtk/gtktextbtree.c
gtk/gtktextbuffer.c
gtk/gtktextbufferrichtext.c
gtk/gtktextbufferserialize.c
gtk/gtktextchild.c
gtk/gtktextdisplay.c
gtk/gtktextiter.c
gtk/gtktextlayout.c
gtk/gtktextmark.c
gtk/gtktextsegment.c
gtk/gtktexttag.c
gtk/gtktexttagtable.c
gtk/gtktexttypes.c
gtk/gtktextutil.c
gtk/gtktextview.c
gtk/gtkthemes.c
gtk/gtktoggleaction.c
gtk/gtktogglebutton.c
gtk/gtktoggletoolbutton.c
gtk/gtktoolbar.c
gtk/gtktoolbutton.c
gtk/gtktoolitem.c
gtk/gtktoolitemgroup.c
gtk/gtktoolpalette.c
gtk/gtktoolshell.c
gtk/gtktooltip.c
gtk/gtktrayicon-x11.c
gtk/gtktreedatalist.c
gtk/gtktreednd.c
gtk/gtktreemodel.c
gtk/gtktreemodelfilter.c
gtk/gtktreemodelsort.c
gtk/gtktreeselection.c
gtk/gtktreesortable.c
gtk/gtktreestore.c
gtk/gtktreeview.c
gtk/gtktreeviewcolumn.c
gtk/gtktypebuiltins.c.template
gtk/gtktypeutils.c
gtk/gtkuimanager.c
gtk/gtkvbbox.c
gtk/gtkvbox.c
gtk/gtkviewport.c
gtk/gtkvolumebutton.c
gtk/gtkvpaned.c
gtk/gtkvruler.c
gtk/gtkvscale.c
gtk/gtkvscrollbar.c
gtk/gtkvseparator.c
gtk/gtkwidget.c
gtk/gtkwin32embed.c
gtk/gtkwin32embedwidget.c
gtk/gtkwindow-decorate.c
gtk/gtkwindow.c
gtk/gtkxembed.c
gtk/makefile.msc.in
gtk/makegtkalias.pl [deleted file]
gtk/pltcheck.sh [deleted file]

index 88b25983b1d8ee00158493d3775f77c406ba1d93..1e0ad40ce12c6269a6cbfea3dfbe6e2c31fabe23 100644 (file)
@@ -21,7 +21,6 @@ CFILE_GLOB=$(top_srcdir)/gtk/*.c
 
 # Header files to ignore when scanning
 IGNORE_HFILES=                         \
-       gtkalias.h                      \
        fnmatch.h                       \
        gtkdebug.h                      \
        gtkbuilderprivate.h             \
index 08cc18d4796ad3446bebd1b3a853a2c26f292794..8e012678ff0e4fd9d0e17691be45f0e1f57c3579 100644 (file)
@@ -103,20 +103,9 @@ endif
 gtk.def: gtk.symbols
        (echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DG_OS_WIN32 -DALL_FILES - <$(srcdir)/gtk.symbols | $(SED) -e '/^$$/d' -e 's/^/ /' -e 's/G_GNUC_[^ ]*//g') > $(srcdir)/gtk.def
 
-gtkalias.h: gtk.symbols
-         $(PERL) $(srcdir)/makegtkalias.pl < $(srcdir)/gtk.symbols > gtkalias.h
-gtkaliasdef.c: gtk.symbols
-         $(PERL) $(srcdir)/makegtkalias.pl -def < $(srcdir)/gtk.symbols > gtkaliasdef.c
-
-check-aliases:
-       @$(TESTS_ENVIRONMENT) $(srcdir)/aliasfilescheck.sh
-
-.PHONY: check-aliases
-
 TESTS_ENVIRONMENT = srcdir="$(srcdir)" gtk_all_c_sources="$(gtk_all_c_sources)"
-TESTS = aliasfilescheck.sh
 if OS_LINUX
-TESTS += abicheck.sh pltcheck.sh
+TESTS = abicheck.sh
 endif
 
 libgtkincludedir = $(includedir)/gtk-3.0/gtk
@@ -732,13 +721,11 @@ gtk_built_public_sources =                        \
 
 # built headers that don't get installed
 gtk_built_private_headers =                    \
-       gtkalias.h                              \
        gtkmarshalers.h                         \
        gtkbuiltincache.h                       \
        gtkimcontextsimpleseqs.h
 
 gtk_built_sources =                            \
-       gtkaliasdef.c                           \
        gtktypebuiltins.c                       \
        gtktypefuncs.c                          \
        gtkmarshalers.c                         \
@@ -794,7 +781,6 @@ stamp-gtkmarshalers.h: @REBUILD@ gtkmarshalers.list
        && echo timestamp > $(@F)       
 gtkmarshalers.c: @REBUILD@ gtkmarshalers.list
        (echo "#include \"gtkmarshalers.h\""; \
-        echo "#include \"gtkalias.h\""; \
         $(GLIB_GENMARSHAL) --prefix=_gtk_marshal $(srcdir)/gtkmarshalers.list --body) >> xgen-gmlc \
        && cp xgen-gmlc gtkmarshalers.c \
        && rm -f xgen-gmlc
@@ -1331,10 +1317,7 @@ EXTRA_DIST +=                   \
        gtkrc.key.mac           \
        makefile.msc            \
        makefile.msc.in         \
-       makegtkalias.pl         \
-       aliasfilescheck.sh      \
        abicheck.sh             \
-       pltcheck.sh             \
        gtktypebuiltins.c.template      \
        gtktypebuiltins.h.template
 
diff --git a/gtk/aliasfilescheck.sh b/gtk/aliasfilescheck.sh
deleted file mode 100755 (executable)
index 31b49d4..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-#! /bin/sh
-
-if test "x$gtk_all_c_sources" = x; then
-       echo gtk_all_c_sources variable not defined
-       exit 1
-fi
-
-grep 'IN_FILE' ${srcdir-.}/gtk.symbols | sed 's/.*(//;s/).*//' | grep __ | sort -u > expected-files
-{ cd ${srcdir-.}; grep '^ *# *define __' $gtk_all_c_sources; } | sed 's/.*define //;s/ *$//' | sort > actual-files
-
-diff expected-files actual-files && rm -f expected-files actual-files
index 6b17f1c2ece5c10a952ee1863a3b21fe15907274..f81d1ebadac380d46c43f460949006953ebd7061 100644 (file)
@@ -55,8 +55,6 @@
 #include "gtkprivate.h"
 #include "gtkintl.h"
 
-#include "gtkalias.h"
-
 
 /**
  * SECTION:gtkaboutdialog
@@ -2441,6 +2439,3 @@ gtk_show_about_dialog (GtkWindow   *parent,
 
   gtk_window_present (GTK_WINDOW (dialog));
 }
-
-#define __GTK_ABOUT_DIALOG_C__
-#include "gtkaliasdef.c"
index b920f8ea7357e6c2ac5ea438a87a77667da7cb5f..79f28591e53c00ce511ebaa2984a4dc0332277b1 100644 (file)
@@ -36,7 +36,7 @@
 #include "gtkmain.h"           /* For _gtk_boolean_handled_accumulator */
 #include "gdk/gdkkeysyms.h"
 #include "gtkmarshalers.h"
-#include "gtkalias.h"
+
 
 /**
  * SECTION:gtkaccelgroup
@@ -1466,6 +1466,3 @@ gtk_accelerator_get_default_mod_mask (void)
 {
   return default_accel_mod_mask;
 }
-
-#define __GTK_ACCEL_GROUP_C__
-#include "gtkaliasdef.c"
index c02be06cc51ccd849edf055d612467cbfa8e87e4..9193ea5bf1beaf75493fb8fc2e5abd2b89d262d2 100644 (file)
@@ -35,7 +35,7 @@
 #include "gtkmain.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
+
 #include <gdk/gdkkeysyms.h>
 
 /**
@@ -899,6 +899,3 @@ gtk_accel_label_refetch (GtkAccelLabel *accel_label)
 
   return FALSE;
 }
-
-#define __GTK_ACCEL_LABEL_C__
-#include "gtkaliasdef.c"
index 31028688f43922c20cad1656cef3a2e06c557a0c..2070011dbc184098bf361a8f912bb2c5c0316fbd 100644 (file)
@@ -23,8 +23,7 @@
 
 #include "gtkmarshalers.h"
 #include "gtkwindow.h"  /* in lack of GtkAcceleratable */
-#include "gtkintl.h" 
-#include "gtkalias.h"
+#include "gtkintl.h"
 
 #include <glib/gstdio.h>
 
@@ -1032,6 +1031,3 @@ gtk_accel_map_save (const gchar *file_name)
 }
 
 #endif
-
-#define __GTK_ACCEL_MAP_C__
-#include "gtkaliasdef.c"
index 8e85b31e34763cc8cc6c26d2897da947acbc5854..3a42ccd28c06994df96a0a2a837fb87ec4828b7b 100644 (file)
@@ -23,7 +23,6 @@
 #include "gtkwidget.h"
 #include "gtkintl.h"
 #include "gtkaccessible.h"
-#include "gtkalias.h"
 
 /**
  * SECTION:gtkaccessible
@@ -116,6 +115,3 @@ gtk_accessible_real_connect_widget_destroyed (GtkAccessible *accessible)
                       &accessible->widget);
   }
 }
-
-#define __GTK_ACCESSIBLE_C__
-#include "gtkaliasdef.c"
index d9440d38dde34c9e5c25bb5ee75e6c16c7c7546d..8902684c72de6c6e97c80519a3b058a9075b2236 100644 (file)
@@ -92,7 +92,6 @@
 #include "gtkprivate.h"
 #include "gtkbuildable.h"
 #include "gtkactivatable.h"
-#include "gtkalias.h"
 
 
 #define GTK_ACTION_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_ACTION, GtkActionPrivate))
@@ -1826,6 +1825,3 @@ gtk_action_create_menu (GtkAction *action)
 
   return NULL;
 }
-
-#define __GTK_ACTION_C__
-#include "gtkaliasdef.c"
index cab79ee2d155480772a0a96ce4b91665b8533861..658a1cad76d7ac08bd74b7146eebe046096d7d1c 100644 (file)
@@ -43,7 +43,6 @@
 #include "gtkbuilderprivate.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 #define GTK_ACTION_GROUP_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_ACTION_GROUP, GtkActionGroupPrivate))
 
@@ -1436,6 +1435,3 @@ _gtk_action_group_emit_post_activate (GtkActionGroup *action_group,
 {
   g_signal_emit (action_group, action_group_signals[POST_ACTIVATE], 0, action);
 }
-
-#define __GTK_ACTION_GROUP_C__
-#include "gtkaliasdef.c"
index 85abdecfe146e08e7934a10d298752af361c655e..77b019ba4d93147c7eb61c1d2c2b5d1d41ddf862 100644 (file)
 #include "gtktypeutils.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 
 static void gtk_activatable_class_init (gpointer g_iface);
@@ -559,6 +558,3 @@ gtk_activatable_get_use_action_appearance  (GtkActivatable *activatable)
 
   return use_appearance;
 }
-
-#define __GTK_ACTIVATABLE_C__
-#include "gtkaliasdef.c"
index dd1b3f609d0e2bb0e4368503b75c6ab2862f035e..d8d344e8ed426eae0b227b585c717f030ece6098 100644 (file)
@@ -29,7 +29,7 @@
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
+
 
 enum
 {
@@ -701,6 +701,3 @@ gtk_adjustment_clamp_page (GtkAdjustment *adjustment,
   if (need_emission)
     gtk_adjustment_value_changed (adjustment);
 }
-
-#define __GTK_ADJUSTMENT_C__
-#include "gtkaliasdef.c"
index 289c56514bdfa09abf5ac53ebeff3e559776367f..e9c65504c5bb5c4f80ba51ef74392df6ed39a99d 100644 (file)
@@ -48,7 +48,7 @@
 #include "gtksizerequest.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
+
 
 enum {
   PROP_0,
@@ -714,6 +714,3 @@ gtk_alignment_get_padding (GtkAlignment    *alignment,
   if(padding_right)
     *padding_right = priv->padding_right;
 }
-
-#define __GTK_ALIGNMENT_C__
-#include "gtkaliasdef.c"
index 5bea91eb722383d4fd2f5e5ff9dd359e3b8d7a83..703ee1dd0233c613f2439383570a60bef1c7049c 100644 (file)
@@ -38,8 +38,6 @@
 #include "gtkintl.h"
 #include "gtkprivate.h"
 
-#include "gtkalias.h"
-
 #include <gdk/gdk.h>
 #ifdef GDK_WINDOWING_X11
 #include <gdk/x11/gdkx.h>
@@ -711,6 +709,3 @@ gtk_application_class_init (GtkApplicationClass *klass)
                  
   g_type_class_add_private (gobject_class, sizeof (GtkApplicationPrivate));
 }
-
-#define __GTK_APPLICATION_C__
-#include "gtkaliasdef.c"
index b69c297966d378ce0f5a3f766fc01f5f3de417b1..22e48db90c5256d618ff2f9a1183e5b8f54684b6 100644 (file)
@@ -49,7 +49,6 @@
 #include "gtkarrow.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 #define MIN_ARROW_SIZE  15
 
@@ -303,6 +302,3 @@ gtk_arrow_expose (GtkWidget      *widget,
 
   return FALSE;
 }
-
-#define __GTK_ARROW_C__
-#include "gtkaliasdef.c"
index beedd19c2c9aace29ac750f0f6959b8879dcab72..c9981518b63ff473e2aee2e3f2caba65e21fa65e 100644 (file)
@@ -47,7 +47,7 @@
 #include "gtkaspectframe.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
+
 
 enum {
   PROP_0,
@@ -350,6 +350,3 @@ gtk_aspect_frame_compute_child_allocation (GtkFrame      *frame,
   else
     GTK_FRAME_CLASS (gtk_aspect_frame_parent_class)->compute_child_allocation (frame, child_allocation);
 }
-
-#define __GTK_ASPECT_FRAME_C__
-#include "gtkaliasdef.c"
index 3c18378cefc47cf1eab71b7bc9252e897ae70cca..164f32668eb28fec0f746132f7614d565420c0a5 100644 (file)
@@ -64,8 +64,6 @@
 #include "gtkprivate.h"
 #include "gtkbuildable.h"
 
-#include "gtkalias.h"
-
 #define GTK_ASSISTANT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTK_TYPE_ASSISTANT, GtkAssistantPrivate))
 
 #define HEADER_SPACING 12
@@ -2551,7 +2549,3 @@ gtk_assistant_buildable_custom_finished (GtkBuildable *buildable,
   parent_buildable_iface->custom_finished (buildable, builder, child,
                                            tagname, user_data);
 }
-
-
-#define __GTK_ASSISTANT_C__
-#include "gtkaliasdef.c"
index 91822148dd392d15a022fef9e6a2a379e07150be..c675ed73000d405f019743aeed35f4ec56f38a70 100644 (file)
@@ -59,7 +59,7 @@
 #include "gtkorientable.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
+
 
 enum {
   PROP_0,
@@ -830,6 +830,3 @@ gtk_button_box_new (GtkOrientation orientation)
                        "orientation", orientation,
                        NULL);
 }
-
-#define __GTK_BUTTON_BOX_C__
-#include "gtkaliasdef.c"
index 595f8c5c7a37d951a052e31b6e66aee60a52b12f..bef71f5228113f9fac579fded4241b3d0ce5963f 100644 (file)
@@ -41,7 +41,7 @@
 #include "gtkbin.h"
 #include "gtksizerequest.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
+
 
 static void gtk_bin_add         (GtkContainer   *container,
                                 GtkWidget      *widget);
@@ -277,6 +277,3 @@ gtk_bin_get_child (GtkBin *bin)
 
   return bin->child;
 }
-
-#define __GTK_BIN_C__
-#include "gtkaliasdef.c"
index c75e22058718770b78959004b553011802c75cc6..406331392ae6b840c0e49331284209cbe848c1a0 100644 (file)
@@ -36,7 +36,6 @@
 #include "gtkkeyhash.h"
 #include "gtkwidget.h"
 #include "gtkrc.h"
-#include "gtkalias.h"
 
 
 /* --- defines --- */
@@ -1676,6 +1675,3 @@ _gtk_binding_reset_parsed (void)
       slist = next;
     }
 }
-
-#define __GTK_BINDINGS_C__
-#include "gtkaliasdef.c"
index 82289f5d248f97095d6f759f05fee5dd1c4420ac..c044b2f921ae7b0e5583818f13d56a296f9b4190 100644 (file)
@@ -80,7 +80,7 @@
 #include "gtksizerequest.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
+
 
 enum {
   PROP_0,
@@ -1712,6 +1712,3 @@ gtk_box_forall (GtkContainer *container,
        (* callback) (child->widget, callback_data);
     }
 }
-
-#define __GTK_BOX_C__
-#include "gtkaliasdef.c"
index 12fc07791d0d20bfc91147832863c269af3b5fe3..963efb3c946c11aaca8eb0929705d3a3e885819c 100644 (file)
@@ -42,7 +42,6 @@
 #include "gtkbuildable.h"
 #include "gtktypeutils.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 
 typedef GtkBuildableIface GtkBuildableInterface;
@@ -359,6 +358,3 @@ gtk_buildable_get_internal_child (GtkBuildable *buildable,
 
   return (* iface->get_internal_child) (buildable, builder, childname);
 }
-
-#define __GTK_BUILDABLE_C__
-#include "gtkaliasdef.c"
index c6d3b0814f07ecefcc245c63a4360a95ebc69a10..c8918b4d13a8bf7bb8f9e5ccf437a5e52d952067 100644 (file)
 #include "gtkwindow.h"
 #include "gtkicontheme.h"
 #include "gtkstock.h"
-#include "gtkalias.h"
+
 
 static void gtk_builder_class_init     (GtkBuilderClass *klass);
 static void gtk_builder_init           (GtkBuilder      *builder);
@@ -1848,6 +1848,3 @@ _gtk_builder_get_absolute_filename (GtkBuilder *builder, const gchar *string)
   
   return filename;
 }
-
-#define __GTK_BUILDER_C__
-#include "gtkaliasdef.c"
index b4f68551365caabc70406ce66f21bb0fd4d034bf..ef2e5e9e091e20319eca001a68e56fa505b2371c 100644 (file)
@@ -31,7 +31,7 @@
 #include "gtkversion.h"
 #include "gtktypeutils.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
+
 
 static void free_property_info (PropertyInfo *info);
 static void free_object_info (ObjectInfo *info);
index a684c265d41694acb1896f9d9837eb4257a3404f..e7d29f41dcff93d14dcabc9211580d637cd3ad44 100644 (file)
@@ -54,7 +54,7 @@
 #include "gtksizerequest.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
+
 
 static const GtkBorder default_default_border = { 1, 1, 1, 1 };
 static const GtkBorder default_default_outside_border = { 0, 0, 0, 0 };
@@ -2494,6 +2494,3 @@ gtk_button_get_event_window (GtkButton *button)
 
   return button->event_window;
 }
-
-#define __GTK_BUTTON_C__
-#include "gtkaliasdef.c"  
index bd8cfdc5029db58f4ffcafb1bf6264641b37e2ad..1bac951299393bd62ad632bd586aa4c1061d9f2f 100644 (file)
@@ -78,7 +78,6 @@
 #include "gtktooltip.h"
 #include "gtkprivate.h"
 #include "gdk/gdkkeysyms.h"
-#include "gtkalias.h"
 
 /***************************************************************************/
 /* The following date routines are taken from the lib_date package. 
@@ -4027,6 +4026,3 @@ gtk_calendar_get_detail_height_rows (GtkCalendar *calendar)
   g_return_val_if_fail (GTK_IS_CALENDAR (calendar), 0);
   return GTK_CALENDAR_GET_PRIVATE (calendar)->detail_height_rows;
 }
-
-#define __GTK_CALENDAR_C__
-#include "gtkaliasdef.c"
index 55bc63b2854e4c945e65dc5220e54d648d03c7cb..09f47533b010987a6fbb1f357e221d889b44a67b 100644 (file)
@@ -33,7 +33,7 @@
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
+
 
 typedef GtkCellEditableIface GtkCellEditableInterface;
 G_DEFINE_INTERFACE(GtkCellEditable, gtk_cell_editable, GTK_TYPE_WIDGET)
@@ -147,6 +147,3 @@ gtk_cell_editable_remove_widget (GtkCellEditable *cell_editable)
 
   g_signal_emit_by_name (cell_editable, "remove-widget");
 }
-
-#define __GTK_CELL_EDITABLE_C__
-#include "gtkaliasdef.c"
index 2fa3c2d3202c99f656043200a1e7e6c391ccf8cd..985457be85abc62995a2dfa4481e2da8e9c01911 100644 (file)
@@ -23,7 +23,7 @@
 #include <errno.h>
 #include "gtkcelllayout.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
+
 
 GType
 gtk_cell_layout_get_type (void)
@@ -442,6 +442,3 @@ _gtk_cell_layout_buildable_add_child (GtkBuildable      *buildable,
   g_return_if_fail (iface->pack_start != NULL);
   iface->pack_start (GTK_CELL_LAYOUT (buildable), GTK_CELL_RENDERER (child), FALSE);
 }
-
-#define __GTK_CELL_LAYOUT_C__
-#include "gtkaliasdef.c"
index 6093719044a7341705559bcab976eddbc6216d4a..d9d95a1369f66cc1a93c6b9760e3e605e6476dd5 100644 (file)
@@ -23,7 +23,7 @@
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
 #include "gtktreeprivate.h"
-#include "gtkalias.h"
+
 
 static void gtk_cell_renderer_get_property  (GObject              *object,
                                             guint                 param_id,
@@ -967,6 +967,3 @@ gtk_cell_renderer_stop_editing (GtkCellRenderer *cell,
        g_signal_emit (cell, cell_renderer_signals[EDITING_CANCELED], 0);
     }
 }
-
-#define __GTK_CELL_RENDERER_C__
-#include "gtkaliasdef.c"
index 9dfd2c2a8abe28ff63d53b650199dc45c1ba847c..3a3eedca873ce71449d348034468f63f99b184ba 100644 (file)
@@ -27,7 +27,6 @@
 #include "gtkmain.h"
 #include "gtkprivate.h"
 #include "gdk/gdkkeysyms.h"
-#include "gtkalias.h"
 
 
 #define GTK_CELL_RENDERER_ACCEL_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTK_TYPE_CELL_RENDERER_ACCEL, GtkCellRendererAccelPrivate))
@@ -665,7 +664,3 @@ gtk_cell_renderer_accel_start_editing (GtkCellRenderer      *cell,
   
   return GTK_CELL_EDITABLE (accel->edit_widget);
 }
-
-
-#define __GTK_CELL_RENDERER_ACCEL_C__
-#include "gtkaliasdef.c"
index ba5fabb63dadff84a9cd9f1d7206ad0ebbe50c99..13ad0304e44a1f9960f36569be3caa833d6ec8e8 100644 (file)
@@ -30,8 +30,6 @@
 #include "gtkcomboboxentry.h"
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
-#include "gtkalias.h"
-
 
 #define GTK_CELL_RENDERER_COMBO_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_CELL_RENDERER_COMBO, GtkCellRendererComboPrivate))
 
@@ -489,6 +487,3 @@ gtk_cell_renderer_combo_start_editing (GtkCellRenderer     *cell,
 
   return GTK_CELL_EDITABLE (combo);
 }
-
-#define __GTK_CELL_RENDERER_COMBO_C__
-#include "gtkaliasdef.c"
index 2337618890e9d41a7f0973be52516d2c717ccae5..fd814519d3f5894985f61677fedd9208c7de7089 100644 (file)
@@ -24,7 +24,7 @@
 #include "gtkicontheme.h"
 #include "gtkintl.h"
 #include "gtkprivate.h"
-#include "gtkalias.h"
+
 
 static void gtk_cell_renderer_pixbuf_get_property  (GObject                    *object,
                                                    guint                       param_id,
@@ -862,6 +862,3 @@ gtk_cell_renderer_pixbuf_render (GtkCellRenderer      *cell,
   if (symbolic)
     g_object_unref (symbolic);
 }
-
-#define __GTK_CELL_RENDERER_PIXBUF_C__
-#include "gtkaliasdef.c"
index 08a7e9ae82f83f2617defd85f9f878415e08379e..794f02a3ad2d6338b946747f1cade0f33447b774 100644 (file)
@@ -32,7 +32,6 @@
 #include "gtkprogressbar.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 #define GTK_CELL_RENDERER_PROGRESS_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object),                        \
                                                                                      GTK_TYPE_CELL_RENDERER_PROGRESS, \
@@ -673,6 +672,3 @@ gtk_cell_renderer_progress_render (GtkCellRenderer *cell,
       g_object_unref (layout);
     }
 }
-
-#define __GTK_CELL_RENDERER_PROGRESS_C__
-#include "gtkaliasdef.c"
index 2a3961bf203cbe59132eb77118ff8f2f00719841..ab583f91a5619531e3a4c71ff34027c20769b4f1 100644 (file)
@@ -26,7 +26,6 @@
 #include "gtkprivate.h"
 #include "gtkspinbutton.h"
 #include "gtkcellrendererspin.h"
-#include "gtkalias.h"
 
 #define GTK_CELL_RENDERER_SPIN_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_CELL_RENDERER_SPIN, GtkCellRendererSpinPrivate))
 
@@ -350,7 +349,3 @@ gtk_cell_renderer_spin_new (void)
 {
   return g_object_new (GTK_TYPE_CELL_RENDERER_SPIN, NULL);
 }
-
-
-#define __GTK_CELL_RENDERER_SPIN_C__
-#include  "gtkaliasdef.c"
index 834433d0cfe16582e4693c4f5678dc713212b678..8a4125ef94f7432fca9b8c40057f03248e9607ea 100644 (file)
@@ -33,7 +33,6 @@
 #include "gtkiconfactory.h"
 #include "gtkicontheme.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 
 /**
@@ -387,6 +386,3 @@ gtk_cell_renderer_spinner_render (GtkCellRenderer *cellr,
                      draw_rect.x, draw_rect.y,
                      draw_rect.width, draw_rect.height);
 }
-
-#define __GTK_CELL_RENDERER_SPINNER_C__
-#include "gtkaliasdef.c"
index 8060ade4ac6c6f285e0a4e5416250e11c7b0f9bc..70def973d369282502e6d162e0abf309b40d2482 100644 (file)
@@ -26,7 +26,7 @@
 #include "gtkintl.h"
 #include "gtkprivate.h"
 #include "gtktreeprivate.h"
-#include "gtkalias.h"
+
 
 static void gtk_cell_renderer_text_finalize   (GObject                  *object);
 
@@ -1929,6 +1929,3 @@ gtk_cell_renderer_text_set_fixed_height_from_font (GtkCellRendererText *renderer
       renderer->calc_fixed_height = TRUE;
     }
 }
-
-#define __GTK_CELL_RENDERER_TEXT_C__
-#include "gtkaliasdef.c"
index 4282131aa1b00945fb902bba3db0a9903c455aa9..a27f44907caf340df1c0f8da2ceb32a223ffcc4e 100644 (file)
@@ -24,7 +24,7 @@
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
 #include "gtktreeprivate.h"
-#include "gtkalias.h"
+
 
 static void gtk_cell_renderer_toggle_get_property  (GObject                    *object,
                                                    guint                       param_id,
@@ -522,6 +522,3 @@ gtk_cell_renderer_toggle_set_activatable (GtkCellRendererToggle *toggle,
       g_object_notify (G_OBJECT (toggle), "activatable");
     }
 }
-
-#define __GTK_CELL_RENDERER_TOGGLE_C__
-#include "gtkaliasdef.c"
index a2692114f40dcf2a0e3d374385ed2f60f64865ca..50003dd3870d420ff50bb04a53e9dacec0613d55 100644 (file)
@@ -27,7 +27,7 @@
 #include "gtkprivate.h"
 #include <gobject/gmarshal.h>
 #include "gtkbuildable.h"
-#include "gtkalias.h"
+
 
 typedef struct _GtkCellViewCellInfo GtkCellViewCellInfo;
 struct _GtkCellViewCellInfo
@@ -1095,7 +1095,3 @@ gtk_cell_view_buildable_custom_tag_end (GtkBuildable *buildable,
     parent_buildable_iface->custom_tag_end (buildable, builder, child, tagname,
                                            data);
 }
-
-
-#define __GTK_CELL_VIEW_C__
-#include "gtkaliasdef.c"
index e7656534aa150f9364489451e259ab9dc03f7750..9caa978004f8ee340fd28b97461e16333bf67d87 100644 (file)
@@ -29,7 +29,6 @@
 #include "gtklabel.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 
 #define INDICATOR_SIZE     13
@@ -424,6 +423,3 @@ gtk_real_check_button_draw_indicator (GtkCheckButton *check_button,
                       x, y, indicator_size, indicator_size);
     }
 }
-
-#define __GTK_CHECK_BUTTON_C__
-#include "gtkaliasdef.c"
index 754382f00ecc0cdad240d0f2118330bfcdf062c8..197eb84a67dfab51505ba03dfcc08b4f4e3c65e7 100644 (file)
@@ -32,7 +32,7 @@
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
+
 
 enum {
   TOGGLED,
@@ -549,6 +549,3 @@ gtk_check_menu_item_set_property (GObject      *object,
       break;
     }
 }
-
-#define __GTK_CHECK_MENU_ITEM_C__
-#include "gtkaliasdef.c"
index 4b57d774febcc617065e63aa2c1857e379ed7794..f433070ce1f5071f9fd6b45daead4ee658319689 100644 (file)
@@ -32,7 +32,7 @@
 #include "gtkintl.h"
 #include "gtktextbuffer.h"
 #include "gtkquartz.h"
-#include "gtkalias.h"
+
 
 enum {
   OWNER_CHANGE,
@@ -1011,6 +1011,3 @@ _gtk_clipboard_store_all (void)
 {
   /* FIXME: Implement */
 }
-
-#define __GTK_CLIPBOARD_C__
-#include "gtkaliasdef.c"
index 7e3c7ac506b3e7895e79a0dc2e310fda89703e78..5e34975d7b2c730c215815908fb17a0a75a5b2cd 100644 (file)
@@ -29,7 +29,6 @@
 #include "gtkmarshalers.h"
 #include "gtktextbufferrichtext.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 #ifdef GDK_WINDOWING_X11
 #include "x11/gdkx.h"
@@ -2082,6 +2081,3 @@ _gtk_clipboard_store_all (void)
   g_slist_free (displays);
   
 }
-
-#define __GTK_CLIPBOARD_C__
-#include "gtkaliasdef.c"
index 2bde61da7f4000855ec7bbada8bb1652e76463e4..878d12748f64f0c9ef970c5acfc810f26a646815 100644 (file)
@@ -44,7 +44,6 @@
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 /* Size of checks and gray levels for alpha compositing checkerboard */
 #define CHECK_SIZE  4
@@ -992,6 +991,3 @@ gtk_color_button_get_property (GObject    *object,
       break;
     }
 }
-
-#define __GTK_COLOR_BUTTON_C__
-#include "gtkaliasdef.c"
index d27ef79de047623daa8472099b9aff50cd02c409..af04ed9a630713699a18120819248953e7b14b21 100644 (file)
@@ -59,7 +59,6 @@
 #include "gtkaccessible.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 /* Number of elements in the custom palatte */
 #define GTK_CUSTOM_PALETTE_WIDTH 10
@@ -2857,7 +2856,3 @@ make_all_relations (AtkObject *atk_obj,
   make_control_relations (atk_obj, priv->green_spinbutton);
   make_control_relations (atk_obj, priv->blue_spinbutton);
 }
-
-#define __GTK_COLOR_SELECTION_C__
-#include "gtkaliasdef.c"
-
index 977cb1585efc482acbf4958160bc41269ffc6f2d..da0b8fcc0379b873d1ff8374b76ed739feb9efac 100644 (file)
@@ -33,7 +33,7 @@
 #include "gtkstock.h"
 #include "gtkintl.h"
 #include "gtkbuildable.h"
-#include "gtkalias.h"
+
 
 enum {
   PROP_0,
@@ -228,7 +228,3 @@ gtk_color_selection_dialog_buildable_get_internal_child (GtkBuildable *buildable
 
     return parent_buildable_iface->get_internal_child (buildable, builder, childname);
 }
-
-
-#define __GTK_COLOR_SELECTION_DIALOG_C__
-#include "gtkaliasdef.c"
index c4e4925994fe7c859034b37e3728e62a7aaef4b7..d7128a764f163f99e582fca06ccef744c9ba1fde 100644 (file)
@@ -51,7 +51,6 @@
 #include "gtkintl.h"
 
 #include "gtktreeprivate.h"
-#include "gtkalias.h"
 
 /* WELCOME, to THE house of evil code */
 
@@ -6033,6 +6032,3 @@ gtk_combo_box_buildable_custom_tag_end (GtkBuildable *buildable,
     parent_buildable_iface->custom_tag_end (buildable, builder, child, tagname,
                                            data);
 }
-
-#define __GTK_COMBO_BOX_C__
-#include "gtkaliasdef.c"
index c63c08561ba35c5c7254e437543f34b2c7030b86..f119f8bff0f7381bc432a7948758fdcdabac6d2c 100644 (file)
@@ -28,7 +28,6 @@
 #include "gtkprivate.h"
 #include "gtkintl.h"
 #include "gtkbuildable.h"
-#include "gtkalias.h"
 
 #define GTK_COMBO_BOX_ENTRY_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_COMBO_BOX_ENTRY, GtkComboBoxEntryPrivate))
 
@@ -461,6 +460,3 @@ gtk_combo_box_entry_get_active_text (GtkComboBox *combo_box)
 
   return NULL;
 }
-
-#define __GTK_COMBO_BOX_ENTRY_C__
-#include "gtkaliasdef.c"
index 4a47afb3927ca217ed9a3470cbaa559e4015c4b0..afd2315c7c1a3d082f4f6161ebf621d4c60572e4 100644 (file)
@@ -40,7 +40,6 @@
 #include "gtktoolbar.h"
 #include <gobject/gobjectnotifyqueue.c>
 #include <gobject/gvaluecollector.h>
-#include "gtkalias.h"
 
 
 enum {
@@ -2684,6 +2683,3 @@ gtk_container_propagate_expose (GtkContainer   *container,
       gdk_event_free (child_event);
     }
 }
-
-#define __GTK_CONTAINER_C__
-#include "gtkaliasdef.c"
index 8d95a11f87678323e37a2c1aebf2bb2f4a444266..28120b1e82da544fa600776d4016b4c68e0bdaf1 100644 (file)
@@ -39,7 +39,6 @@
 #include "gtkcustompaperunixdialog.h"
 #include "gtkprintbackend.h"
 #include "gtkprintutils.h"
-#include "gtkalias.h"
 
 #define CUSTOM_PAPER_FILENAME ".gtk-custom-papers"
 
@@ -1181,7 +1180,3 @@ populate_dialog (GtkCustomPaperUnixDialog *dialog)
 
   load_print_backends (dialog);
 }
-
-
-#define __GTK_CUSTOM_PAPER_UNIX_DIALOG_C__
-#include "gtkaliasdef.c"
index d6b7bcd68252881409836a987c151b0855cd2772..5026290d0b2ece27edd245a8c79a3fa575a04abb 100644 (file)
@@ -40,7 +40,6 @@
 #include "gtkbindings.h"
 #include "gtkprivate.h"
 #include "gtkbuildable.h"
-#include "gtkalias.h"
 
 #define GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_DIALOG, GtkDialogPrivate))
 
@@ -1547,6 +1546,3 @@ gtk_dialog_get_content_area (GtkDialog *dialog)
 
   return dialog->vbox;
 }
-
-#define __GTK_DIALOG_C__
-#include "gtkaliasdef.c"
index 9a4ee30892be7588be054db253540ad160b4b7fe..9f89a7618281b98ea64d2eb4b66e7679f5c796de 100644 (file)
@@ -44,7 +44,6 @@
 #include "gtkwindow.h"
 #include "gtkintl.h"
 #include "gtkquartz.h"
-#include "gtkalias.h"
 #include "gdk/quartz/gdkquartz.h"
 
 typedef struct _GtkDragSourceSite GtkDragSourceSite;
@@ -1919,6 +1918,3 @@ gtk_drag_check_threshold (GtkWidget *widget,
   return (ABS (current_x - start_x) > drag_threshold ||
          ABS (current_y - start_y) > drag_threshold);
 }
-
-#define __GTK_DND_C__
-#include "gtkaliasdef.c"
index a0d878d5c2d5636a359ab6ef0f99c6b254af0442..2322ec467d815f4fe3db164cbcf8735ef5b1fd7b 100644 (file)
@@ -51,7 +51,6 @@
 #include "gtkwindow.h"
 #include "gtkintl.h"
 #include "gtkdndcursors.h"
-#include "gtkalias.h"
 
 static GSList *source_widgets = NULL;
 
@@ -4384,6 +4383,3 @@ gtk_drag_check_threshold (GtkWidget *widget,
   return (ABS (current_x - start_x) > drag_threshold ||
          ABS (current_y - start_y) > drag_threshold);
 }
-
-#define __GTK_DND_C__
-#include "gtkaliasdef.c"
index 0ac5952f2da0296d35bbf2a1b325539cab172c27..e5968f790b53d7ef45d7f72241608b1e26e87f92 100644 (file)
@@ -27,7 +27,6 @@
 #include "config.h"
 #include "gtkdrawingarea.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 
 static void gtk_drawing_area_realize       (GtkWidget           *widget);
@@ -135,6 +134,3 @@ gtk_drawing_area_send_configure (GtkDrawingArea *darea)
   gtk_widget_event (widget, event);
   gdk_event_free (event);
 }
-
-#define __GTK_DRAWING_AREA_C__
-#include "gtkaliasdef.c"
index d7eaa945e20690644ce0651eabc9bb2d9376035b..16a000370e76733b38cbd0c622d9d8f0ac4a5fc9 100644 (file)
@@ -30,7 +30,6 @@
 #include "gtkeditable.h"
 #include "gtkmarshalers.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 
 static void gtk_editable_base_init (gpointer g_class);
@@ -424,6 +423,3 @@ gtk_editable_get_editable (GtkEditable *editable)
 
   return value;
 }
-
-#define __GTK_EDITABLE_C__
-#include "gtkaliasdef.c"
index f0fd92c1db5ba301f81b35bbac5dafb57775c86d..046cc766edff6235e35ce78c1097f4e9768209b3 100644 (file)
@@ -65,7 +65,6 @@
 #include "gtktooltip.h"
 #include "gtkiconfactory.h"
 #include "gtkicontheme.h"
-#include "gtkalias.h"
 
 #define GTK_ENTRY_COMPLETION_KEY "gtk-entry-completion-key"
 
@@ -10030,6 +10029,3 @@ keymap_state_changed (GdkKeymap *keymap,
   else
     remove_capslock_feedback (entry);
 }
-
-#define __GTK_ENTRY_C__
-#include "gtkaliasdef.c"
index 27947b11995b131f3c7dbbfa2b8988e85f627be0..179a72001511593b2b4018d199e40a0c6e15d1c7 100644 (file)
@@ -24,7 +24,6 @@
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
 #include "gtkwidget.h"
-#include "gtkalias.h"
 
 #include <gdk/gdk.h>
 
@@ -749,6 +748,3 @@ gtk_entry_buffer_emit_deleted_text (GtkEntryBuffer *buffer,
   g_return_if_fail (GTK_IS_ENTRY_BUFFER (buffer));
   g_signal_emit (buffer, signals[DELETED_TEXT], 0, position, n_chars);
 }
-
-#define __GTK_ENTRY_BUFFER_C__
-#include "gtkaliasdef.c"
index 6225b41dda4fdf12687fcbff99b3c42cf7bc507d..12b42402188f818d61eceb8bcff8ce87967daac5 100644 (file)
@@ -35,7 +35,6 @@
 #include "gtkmarshalers.h"
 
 #include "gtkprivate.h"
-#include "gtkalias.h"
 
 #include <string.h>
 
@@ -2006,6 +2005,3 @@ gtk_entry_completion_get_inline_selection (GtkEntryCompletion *completion)
 
   return completion->priv->inline_selection;
 }
-
-#define __GTK_ENTRY_COMPLETION_C__
-#include "gtkaliasdef.c"
index bb334e154f3aa424c1fd11e31cd2d86fb17c2574..abad1611bc19e20a30083117ff391d2d37cb4c66 100644 (file)
@@ -28,7 +28,7 @@
 #include "gtkeventbox.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
+
 
 typedef struct
 {
@@ -570,6 +570,3 @@ gtk_event_box_expose (GtkWidget      *widget,
 
   return FALSE;
 }
-
-#define __GTK_EVENT_BOX_C__
-#include "gtkaliasdef.c"
index b7a61f7353e43fe4d778389d1a56d37bb0e1fb7d..270769640c525d590a1a665c3cb1946d222af43a 100644 (file)
@@ -34,7 +34,6 @@
 #include "gtkprivate.h"
 #include <gdk/gdkkeysyms.h>
 #include "gtkdnd.h"
-#include "gtkalias.h"
 
 #define GTK_EXPANDER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTK_TYPE_EXPANDER, GtkExpanderPrivate))
 
@@ -1743,6 +1742,3 @@ gtk_expander_get_label_widget (GtkExpander *expander)
 
   return expander->priv->label_widget;
 }
-
-#define __GTK_EXPANDER_C__
-#include "gtkaliasdef.c"
index 996377df927c0b5d346a3b07321401a772cfef25..28f9f0c6d6f9819c616e7943a21f5de07be89411 100644 (file)
@@ -25,7 +25,6 @@
 #include "gtktypebuiltins.h"
 #include "gtkprivate.h"
 #include "gtkmarshalers.h"
-#include "gtkalias.h"
 
 
 /**
@@ -2755,6 +2754,3 @@ gtk_file_chooser_list_shortcut_folders (GtkFileChooser *chooser)
 }
 
 #endif
-
-#define __GTK_FILE_CHOOSER_C__
-#include "gtkaliasdef.c"
index 439e3ded688ca17745faf559cff8bde13ee3388b..5086399012b15c0f28e8da93f5b0479b5a732ac0 100644 (file)
@@ -53,7 +53,6 @@
 #include "gtkfilechooserbutton.h"
 
 #include "gtkprivate.h"
-#include "gtkalias.h"
 
 /* **************** *
  *  Private Macros  *
@@ -2890,6 +2889,3 @@ gtk_file_chooser_button_get_focus_on_click (GtkFileChooserButton *button)
   
   return button->priv->focus_on_click;
 }
-
-#define __GTK_FILE_CHOOSER_BUTTON_C__
-#include "gtkaliasdef.c"
index 7f1f31c0e29ed5f81d3914906786621be06e28b3..e340d7f8a3f831f192e4d446388d12bb8513091a 100644 (file)
@@ -70,8 +70,6 @@
 #include "gtkvbox.h"
 #include "gtkintl.h"
 
-#include "gtkalias.h"
-
 #include <errno.h>
 #include <string.h>
 #include <time.h>
index 0660f27d66544f3e94a467f947019d7b81d5facd..ad1f911df756c564d9c7d791348bf4bb033ce0bb 100644 (file)
@@ -29,7 +29,6 @@
 #include "gtkfilesystem.h"
 #include "gtktypebuiltins.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 #include <stdarg.h>
 
@@ -461,6 +460,3 @@ gtk_file_chooser_dialog_new (const gchar         *title,
 
   return result;
 }
-
-#define __GTK_FILE_CHOOSER_DIALOG_C__
-#include "gtkaliasdef.c"
index 327c5423c42a00c5405c32cd19cde5565a40fa28..2ff1e3065815edd1af35a5e59b880164e8a1183a 100644 (file)
@@ -22,7 +22,6 @@
 #include "gtkfilechooserembed.h"
 #include "gtkmarshalers.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 static void gtk_file_chooser_embed_class_init (gpointer g_iface);
 static void delegate_get_default_size         (GtkFileChooserEmbed *chooser_embed,
index 4c52924d3e8ca91a4d182289c5eee72b366377cd..28cde5d73f39f8cbb3c9da58082fc3aefdc4d2bf 100644 (file)
@@ -30,7 +30,6 @@
 #include "gtkmain.h"
 #include "gtkwindow.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 typedef struct _GtkFileChooserEntryClass GtkFileChooserEntryClass;
 
index 1fc9623ae481565414874db7bddafe6f0982f2cd..1c92eeafae28a004fb00a4a8ce4d2d55da0a12a1 100644 (file)
@@ -35,7 +35,6 @@
 #include <glib.h>
 #include <glib/gi18n-lib.h>
 #include "gtkfilechoosersettings.h"
-#include "gtkalias.h"
 
 #define SETTINGS_GROUP         "Filechooser Settings"
 #define LOCATION_MODE_KEY      "LocationMode"
index 1f0847bf9dac0e06f2d63da4b6165e1944bf5360..e0fefcfe034748a2602b43932b22765601bd6892 100644 (file)
@@ -25,7 +25,7 @@
 #include "gtkfilesystem.h"
 #include "gtktypebuiltins.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
+
 
 static gboolean       delegate_set_current_folder     (GtkFileChooser    *chooser,
                                                       GFile             *file,
index ca37b17936fa71bf74fe6da890dd42febe81b7f9..567f77f152535cd941b3c59804ba8c330cb4f0f6 100644 (file)
@@ -27,7 +27,6 @@
 #include "gtktypebuiltins.h"
 #include "gtkfilechooserembed.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 #define GTK_FILE_CHOOSER_WIDGET_GET_PRIVATE(o)  (GTK_FILE_CHOOSER_WIDGET (o)->priv)
 
@@ -162,6 +161,3 @@ gtk_file_chooser_widget_new (GtkFileChooserAction action)
                       "action", action,
                       NULL);
 }
-
-#define __GTK_FILE_CHOOSER_WIDGET_C__
-#include "gtkaliasdef.c"
index f64c5761bfcef110aee3b3e4446b2abbd804da18..f0e437fe05cd90351276894f668be193380c5f8d 100644 (file)
@@ -25,8 +25,6 @@
 #include "gtkintl.h"
 #include "gtkprivate.h"
 
-#include "gtkalias.h"
-
 typedef struct _GtkFileFilterClass GtkFileFilterClass;
 typedef struct _FilterRule FilterRule;
 
@@ -421,6 +419,3 @@ gtk_file_filter_filter (GtkFileFilter           *filter,
 
   return FALSE;
 }
-
-#define __GTK_FILE_FILTER_C__
-#include "gtkaliasdef.c"
index ea79fed044ab17e17474566c2daa4bfb92599b3d..93c77b7edc392cecb14c8dba0d7478116bc7e1be 100644 (file)
@@ -31,8 +31,6 @@
 #include "gtkicontheme.h"
 #include "gtkprivate.h"
 
-#include "gtkalias.h"
-
 /* #define DEBUG_MODE */
 #ifdef DEBUG_MODE
 #define DEBUG(x) g_debug (x);
index 7c9e1dca0f51f7141476853cbf6794b7eb2563b7..5b29b9bc394e7cb9045c0ee585d3f2c2fefd9aa8 100644 (file)
@@ -31,7 +31,6 @@
 #include "gtktreedatalist.h"
 #include "gtktreednd.h"
 #include "gtktreemodel.h"
-#include "gtkalias.h"
 
 /*** Structure: how GtkFileSystemModel works
  *
index 9a0d67f0ee49d586b37a5def52619cfeb4c1c7dd..820d71c64c0e3400b40b3e28c9f8fa2d5a8b2b40 100644 (file)
@@ -28,7 +28,8 @@
 #include "gtkfixed.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
+
+
 enum {
   CHILD_PROP_0,
   CHILD_PROP_X,
@@ -452,6 +453,3 @@ gtk_fixed_forall (GtkContainer *container,
       (* callback) (child->widget, callback_data);
     }
 }
-
-#define __GTK_FIXED_C__
-#include "gtkaliasdef.c"
index 694c61874a545fe3346987f75398640f37a7f98c..565654e870f64bddc53e265c736e65c800c93fb7 100644 (file)
@@ -40,7 +40,6 @@
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 #include <string.h>
 #include <stdio.h>
@@ -914,6 +913,3 @@ gtk_font_button_update_font_info (GtkFontButton *font_button)
   
   pango_font_description_free (desc);
 } 
-
-#define __GTK_FONT_BUTTON_C__
-#include "gtkaliasdef.c"
index 9e4daabc6c4dc5b4cedb07444c01bc8cee1eac28..9438b948eaddf697526319226a57db7536cd5255 100644 (file)
@@ -60,7 +60,6 @@
 #include "gtkaccessible.h"
 #include "gtkprivate.h"
 #include "gtkbuildable.h"
-#include "gtkalias.h"
 
 /* We don't enable the font and style entries because they don't add
  * much in terms of visible effect and have a weird effect on keynav.
@@ -1781,6 +1780,3 @@ gtk_font_selection_dialog_set_preview_text (GtkFontSelectionDialog *fsd,
 
   gtk_font_selection_set_preview_text (GTK_FONT_SELECTION (fsd->fontsel), text);
 }
-
-#define __GTK_FONTSEL_C__
-#include "gtkaliasdef.c"
index 917d563033037db7be202a25ed1d5a9c67df9a6a..01707fc19ed1c8f185eebc735557ecbb927b98a9 100644 (file)
@@ -32,7 +32,6 @@
 #include "gtkintl.h"
 #include "gtkbuildable.h"
 #include "gtksizerequest.h"
-#include "gtkalias.h"
 
 #define LABEL_PAD 1
 #define LABEL_SIDE_PAD 2
@@ -801,6 +800,3 @@ gtk_frame_size_request_init (GtkSizeRequestIface *iface)
   iface->get_width = gtk_frame_get_width;
   iface->get_height = gtk_frame_get_height;
 }
-
-#define __GTK_FRAME_C__
-#include "gtkaliasdef.c"
index 80a2d66cfc13015024175947010bde081fb69340..d277ee3698f69c23ecb355a651b02a3b742862c6 100644 (file)
@@ -27,7 +27,6 @@
 #include "config.h"
 #include "gtkgc.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 
 typedef struct _GtkGCKey       GtkGCKey;
@@ -403,6 +402,3 @@ gtk_gc_drawable_equal (GtkGCDrawable *a,
 {
   return (a->depth == b->depth);
 }
-
-#define __GTK_GC_C__
-#include "gtkaliasdef.c"
index 119ba107edea342660e37a582ca54f4aedbde5ba..55760192bf8b11ef215d4300c8d2e92d29927e4a 100644 (file)
@@ -34,7 +34,7 @@
 #include "gtkwindow.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
+
 
 typedef struct _GtkHandleBoxPrivate GtkHandleBoxPrivate;
 
@@ -1436,6 +1436,3 @@ gtk_handle_box_end_drag (GtkHandleBox *hb,
 
   private->grab_device = NULL;
 }
-
-#define __GTK_HANDLE_BOX_C__
-#include "gtkaliasdef.c"
index 55b0b150983520b178b46f0e78dd02dadb305c0b..87174a7f1ab8f853dc4a580adbd59f6a1828980a 100644 (file)
@@ -28,7 +28,6 @@
 #include "gtkhbbox.h"
 #include "gtkorientable.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 static gint default_layout_style = GTK_BUTTONBOX_EDGE;
 
@@ -57,6 +56,3 @@ _gtk_hbutton_box_get_layout_default (void)
 {
   return default_layout_style;
 }
-
-#define __GTK_HBUTTON_BOX_C__
-#include "gtkaliasdef.c"
index 61855f35af37d77e33d1c537434987b7afccea99..75d4ab0984676c5d461ccad3ce9d495a6b1e2fda 100644 (file)
@@ -28,7 +28,6 @@
 
 #include "gtkhbox.h"
 #include "gtkorientable.h"
-#include "gtkalias.h"
 
 
 /**
@@ -80,6 +79,3 @@ gtk_hbox_new (gboolean homogeneous,
                        "homogeneous", homogeneous ? TRUE : FALSE,
                        NULL);
 }
-
-#define __GTK_HBOX_C__
-#include "gtkaliasdef.c"
index 95afcb72bb1615ca5a710ed87eb589b6daeca46c..86742f564c66251d59ce75f54bf6bd0c63d46821 100644 (file)
@@ -28,7 +28,7 @@
 
 #include "gtkhpaned.h"
 #include "gtkorientable.h"
-#include "gtkalias.h"
+
 
 G_DEFINE_TYPE (GtkHPaned, gtk_hpaned, GTK_TYPE_PANED)
 
@@ -49,6 +49,3 @@ gtk_hpaned_new (void)
 {
   return g_object_new (GTK_TYPE_HPANED, NULL);
 }
-
-#define __GTK_HPANED_C__
-#include "gtkaliasdef.c"
index 66e5a1788e448acc866d7cde3c191f21ceed683b..c8893b160b977d58e18c4394b0c7372589744796 100644 (file)
@@ -28,7 +28,7 @@
 
 #include "gtkhruler.h"
 #include "gtkorientable.h"
-#include "gtkalias.h"
+
 
 G_DEFINE_TYPE (GtkHRuler, gtk_hruler, GTK_TYPE_RULER)
 
@@ -49,6 +49,3 @@ gtk_hruler_new (void)
 {
   return g_object_new (GTK_TYPE_HRULER, NULL);
 }
-
-#define __GTK_HRULER_C__
-#include "gtkaliasdef.c"
index c641dcbcafcf9de09d625177dadc71c5045bd094..5d4c54e78849583a44e571120f39112792b9c44d 100644 (file)
@@ -31,7 +31,6 @@
 
 #include "gtkhscale.h"
 #include "gtkorientable.h"
-#include "gtkalias.h"
 
 
 G_DEFINE_TYPE (GtkHScale, gtk_hscale, GTK_TYPE_SCALE)
@@ -111,6 +110,3 @@ gtk_hscale_new_with_range (gdouble min,
 
   return GTK_WIDGET (scale);
 }
-
-#define __GTK_HSCALE_C__
-#include "gtkaliasdef.c"
index 881e45ee29fdf4c6e54770ecf36ace17dfd2fb83..f2933a19529f4ba81381182a154c08bb3a5c3c3f 100644 (file)
@@ -30,7 +30,7 @@
 #include "gtkhscrollbar.h"
 #include "gtkorientable.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
+
 
 G_DEFINE_TYPE (GtkHScrollbar, gtk_hscrollbar, GTK_TYPE_SCROLLBAR)
 
@@ -65,6 +65,3 @@ gtk_hscrollbar_new (GtkAdjustment *adjustment)
                        "adjustment", adjustment,
                        NULL);
 }
-
-#define __GTK_HSCROLLBAR_C__
-#include "gtkaliasdef.c"
index 91d437a1ac5706ffa1353d3c99f38e5d369d2c4a..edbc0c96a38a7f896b20ec9928dd0f282a1cdcdc 100644 (file)
@@ -28,7 +28,7 @@
 
 #include "gtkhseparator.h"
 #include "gtkorientable.h"
-#include "gtkalias.h"
+
 
 G_DEFINE_TYPE (GtkHSeparator, gtk_hseparator, GTK_TYPE_SEPARATOR)
 
@@ -49,6 +49,3 @@ gtk_hseparator_new (void)
 {
   return g_object_new (GTK_TYPE_HSEPARATOR, NULL);
 }
-
-#define __GTK_HSEPARATOR_C__
-#include "gtkaliasdef.c"
index a8a22cba4ddc2488dffa2f285b04d4ddd08df21a..a59090b03da36fce01945ea684edd84a14491211 100644 (file)
@@ -40,7 +40,6 @@
 #include "gtkbindings.h"
 #include "gtkmarshalers.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 /* Default width/height */
 #define DEFAULT_SIZE 100
@@ -1693,6 +1692,3 @@ gtk_hsv_move (GtkHSV          *hsv,
   
   gtk_hsv_set_color (hsv, hue, sat, val);
 }
-
-#define __GTK_HSV_C__
-#include "gtkaliasdef.c"
index 6a433fc97cdabe2c556ad0cf71018d49f15dc00e..73d063aee3e59404b06bcf954de087c48cfcde95 100644 (file)
@@ -22,7 +22,6 @@
 #include "gtkdebug.h"
 #include "gtkiconcache.h"
 #include "gtkiconcachevalidator.h"
-#include "gtkalias.h"
 
 #include <glib/gstdio.h>
 #include <gdk-pixbuf/gdk-pixdata.h>
index 0e6e3d8ed197eb62a1b631c62590741996886415..b561995ce3873319e80f1bbbbdb486a6c575bb84 100644 (file)
@@ -38,7 +38,6 @@
 #include "gtkintl.h"
 #include "gtkbuildable.h"
 #include "gtkbuilderprivate.h"
-#include "gtkalias.h"
 
 
 static GSList *all_icon_factories = NULL;
@@ -3003,6 +3002,3 @@ gtk_icon_source_get_filename (const GtkIconSource *source)
 }
 
 #endif
-
-#define __GTK_ICON_FACTORY_C__
-#include "gtkaliasdef.c"
index 0b06b32988a17891001d3349d821820e362a97ec..63dcee784320feca78d4fbd43ce6b4c3ba2a5879 100644 (file)
@@ -46,7 +46,6 @@
 #include "gtkmain.h"
 #include "gtksettings.h"
 #include "gtkprivate.h"
-#include "gtkalias.h"
 
 #define DEFAULT_THEME_NAME "hicolor"
 
@@ -3810,6 +3809,3 @@ gtk_icon_info_get_filename (GtkIconInfo *icon_info)
 }
 
 #endif
-
-#define __GTK_ICON_THEME_C__
-#include "gtkaliasdef.c"
index f96dbd2777b0cacf3a6e507ddddeca9f48361a6c..cf6acff964999fbcf73e18e08738a7cc869ea011 100644 (file)
@@ -41,7 +41,6 @@
 #include "gtktextbuffer.h"
 #include "gtktreednd.h"
 #include "gtkprivate.h"
-#include "gtkalias.h"
 
 /**
  * SECTION:gtkiconview
@@ -9979,8 +9978,3 @@ gtk_icon_view_buildable_custom_tag_end (GtkBuildable *buildable,
     parent_buildable_iface->custom_tag_end (buildable, builder, child, tagname,
                                            data);
 }
-
-
-
-#define __GTK_ICON_VIEW_C__
-#include "gtkaliasdef.c"
index df032f29f535c78cb1f09043930e47bb658ef698..a234e4a94e91ef910edfcf6b2602f82d2b535431 100644 (file)
@@ -35,7 +35,6 @@
 #include "gtkicontheme.h"
 #include "gtkintl.h"
 #include "gtkprivate.h"
-#include "gtkalias.h"
 
 /**
  * SECTION:gtkimage
@@ -2542,6 +2541,3 @@ gtk_image_set_from_file   (GtkImage    *image,
 }
 
 #endif
-
-#define __GTK_IMAGE_C__
-#include "gtkaliasdef.c"
index f634d713598fbc3547274e8e424fda641008fa06..605c63ecd98ef446d98f2d71922cabefd9842bfb 100644 (file)
@@ -36,7 +36,7 @@
 #include "gtkwindow.h"
 #include "gtkactivatable.h"
 #include "gtkprivate.h"
-#include "gtkalias.h"
+
 
 static void gtk_image_menu_item_destroy              (GtkObject        *object);
 static void gtk_image_menu_item_size_request         (GtkWidget        *widget,
@@ -1058,6 +1058,3 @@ gtk_image_menu_item_screen_changed (GtkWidget *widget,
 
   show_image_change_notify (GTK_IMAGE_MENU_ITEM (widget));
 }
-
-#define __GTK_IMAGE_MENU_ITEM_C__
-#include "gtkaliasdef.c"
index 7aec5c1d6b89263afc7cf057f5dd361571ba6eed..d918a5ab9f9da7cd52283317a37e3781f1e67267 100644 (file)
@@ -23,7 +23,6 @@
 #include "gtkmain.h"           /* For _gtk_boolean_handled_accumulator */
 #include "gtkmarshalers.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 /**
  * SECTION:gtkimcontext
@@ -709,6 +708,3 @@ gtk_im_context_delete_surrounding (GtkIMContext *context,
 
   return result;
 }
-
-#define __GTK_IM_CONTEXT_C__
-#include "gtkaliasdef.c"
index 2f4ddd0e66c86812e3d375bd7c99c448c049280b..f45efcc76fc5331b31f10956766821f36fd5ebb9 100644 (file)
@@ -28,7 +28,7 @@
 #include "gtksettings.h"
 #include "gtkwidget.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
+
 
 typedef struct _GtkComposeTable GtkComposeTable;
 typedef struct _GtkComposeTableCompact GtkComposeTableCompact;
@@ -1143,6 +1143,3 @@ gtk_im_context_simple_add_table (GtkIMContextSimple *context_simple,
 
   context_simple->tables = g_slist_prepend (context_simple->tables, table);
 }
-
-#define __GTK_IM_CONTEXT_SIMPLE_C__
-#include "gtkaliasdef.c"
index 97967d45feed48abee28c09c82ddb295188c0d5a..70a689d39c68f4b1c1345d79b7684385b58a0474 100644 (file)
@@ -38,7 +38,6 @@
 #include "gtkmain.h"
 #include "gtkrc.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 /* Do *not* include "gtkprivate.h" in this file. If you do, the
  * correct_libdir_prefix() and correct_localedir_prefix() functions
index 6ba5a98934ea9e7baede0ea3b2ab4f956a71c8b8..cbaebe8a081e532be1f61771ebd491a15c8f267c 100644 (file)
@@ -28,7 +28,6 @@
 #include "gtkradiomenuitem.h"
 #include "gtkintl.h"
 #include "gtkprivate.h" /* To get redefinition of GTK_LOCALE_DIR on Win32 */
-#include "gtkalias.h"
 
 #define NONE_ID "gtk-im-context-none"
 
@@ -709,7 +708,3 @@ gtk_im_multicontext_set_context_id (GtkIMMulticontext *context,
   context->priv->context_id = g_strdup (context_id);
   gtk_im_multicontext_set_slave (context, NULL, FALSE);
 }
-
-
-#define __GTK_IM_MULTICONTEXT_C__
-#include "gtkaliasdef.c"
index f49155b2f94dfd8fefcd4b44f29f7e99ffc44623..84127d6d36f4335d28b5bdaf15ce28107646276b 100644 (file)
@@ -47,8 +47,6 @@
 #include "gtkprivate.h"
 #include "gtkstock.h"
 #include "gdkkeysyms.h"
-#include "gtkalias.h"
-
 
 /**
  * SECTION:gtkinfobar
@@ -1259,7 +1257,3 @@ gtk_info_bar_get_message_type (GtkInfoBar *info_bar)
 
   return priv->message_type;
 }
-
-
-#define __GTK_INFO_BAR_C__
-#include "gtkaliasdef.c"
index 8c0b3beb5e019c66d62f9808275b7298cd15dad3..08e65f3f2bff9e0953bd3ac94398d6195e5ebc9a 100644 (file)
@@ -29,7 +29,6 @@
 #include "gtkinvisible.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 enum {
   PROP_0,
@@ -320,6 +319,3 @@ gtk_invisible_constructor (GType                  type,
 
   return object;
 }
-
-#define __GTK_INVISIBLE_C__
-#include "gtkaliasdef.c"
index b21c1e5fc1d09237fa9b3ba2aff657b997a83c69..ddcf571c7f520e1bcbd9eed1e359e74fc4a6c9e2 100644 (file)
@@ -28,7 +28,6 @@
 #include "gtkitem.h"
 #include "gtkmarshalers.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 
 enum {
@@ -171,6 +170,3 @@ gtk_item_leave (GtkWidget        *widget,
 
   return gtk_widget_event (widget->parent, (GdkEvent*) event);
 }
-
-#define __GTK_ITEM_C__
-#include "gtkaliasdef.c"
index cbe0b7747c57fbcd5adb85e09983e543c4e3bb42..df67f53af85a186d4a861be03478e3c684f541d6 100644 (file)
@@ -21,7 +21,6 @@
 #include "config.h"
 #include "gtkdebug.h"
 #include "gtkkeyhash.h"
-#include "gtkalias.h"
 
 typedef struct _GtkKeyHashEntry GtkKeyHashEntry;
 
index 71eeb9a03a754c887597ca33d7d9a063e962720d..0e5c29704a261b5d69e2fd9fed1ee3adc2c24c7f 100644 (file)
@@ -50,7 +50,6 @@
 #include "gtktooltip.h"
 #include "gtksizerequest.h"
 #include "gtkprivate.h"
-#include "gtkalias.h"
 
 #define GTK_LABEL_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_LABEL, GtkLabelPrivate))
 
@@ -6401,7 +6400,3 @@ gtk_label_query_tooltip (GtkWidget  *widget,
                                                                    keyboard_tip,
                                                                    tooltip);
 }
-
-
-#define __GTK_LABEL_C__
-#include "gtkaliasdef.c"
index 868347f6452df404e06332e0b27a48d4c85632d0..deb420654bef838b6e988e0f130584625feddcd2 100644 (file)
@@ -35,7 +35,7 @@
 #include "gtkprivate.h"
 #include "gtkintl.h"
 #include "gtkmarshalers.h"
-#include "gtkalias.h"
+
 
 typedef struct _GtkLayoutChild   GtkLayoutChild;
 
@@ -1076,6 +1076,3 @@ gtk_layout_adjustment_changed (GtkAdjustment *adjustment,
       gdk_window_process_updates (layout->bin_window, TRUE);
     }
 }
-
-#define __GTK_LAYOUT_C__
-#include "gtkaliasdef.c"
index 572c7166d774a03f50bd66a6d3cc7039bb1db09d..0370d033aa08f38eeeaaad4c657ce4eae1a40f11 100644 (file)
@@ -40,7 +40,6 @@
 #include "gtklinkbutton.h"
 
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 
 struct _GtkLinkButtonPrivate
@@ -785,7 +784,3 @@ gtk_link_button_get_visited (GtkLinkButton *link_button)
   
   return link_button->priv->visited;
 }
-
-
-#define __GTK_LINK_BUTTON_C__
-#include "gtkaliasdef.c"
index 61b314d8c74297a5a7ce710c474008e8a47a45ee..2c2aa80247a929c6eff1626e2e429fa4510bb551 100644 (file)
@@ -29,7 +29,6 @@
 #include "gtkintl.h"
 #include "gtkbuildable.h"
 #include "gtkbuilderprivate.h"
-#include "gtkalias.h"
 
 #define GTK_LIST_STORE_IS_SORTED(list) (((GtkListStore*)(list))->sort_column_id != GTK_TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID)
 #define VALID_ITER(iter, list_store) ((iter)!= NULL && (iter)->user_data != NULL && list_store->stamp == (iter)->stamp && !g_sequence_iter_is_end ((iter)->user_data) && g_sequence_iter_get_sequence ((iter)->user_data) == list_store->seq)
@@ -2382,6 +2381,3 @@ gtk_list_store_buildable_custom_tag_end (GtkBuildable *buildable,
   else
     g_warning ("Unknown custom list store tag: %s", tagname);
 }
-
-#define __GTK_LIST_STORE_C__
-#include "gtkaliasdef.c"
index 846135da4402228103c2d42405b5e03549682b4c..cf3cd53da1278352e2bd3508a0d1b3f72cc6681d 100644 (file)
@@ -62,7 +62,6 @@
 #include "gtkwindow.h"
 #include "gtktooltip.h"
 #include "gtkdebug.h"
-#include "gtkalias.h"
 #include "gtkmenu.h"
 #include "gdk/gdkkeysyms.h"
 
@@ -2442,6 +2441,3 @@ _gtk_boolean_handled_accumulator (GSignalInvocationHint *ihint,
   
   return continue_emission;
 }
-
-#define __GTK_MAIN_C__
-#include "gtkaliasdef.c"
index c9b23827a7da6c5491738ee01d9b6213e3100d1e..f119c6f0a01a3e41038aed4938d3b81d115f7a3b 100644 (file)
@@ -43,8 +43,6 @@
 #include "gtksettings.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
-
 
 #define DEFAULT_POPUP_DELAY     225
 #define DEFAULT_POPDOWN_DELAY  1000
@@ -5486,6 +5484,3 @@ gtk_menu_get_reserve_toggle_size (GtkMenu *menu)
 
   return !priv->no_toggle_size;
 }
-
-#define __GTK_MENU_C__
-#include "gtkaliasdef.c"
index 13329751ceb34d6ac652213b371e93890fe032f7..9f898b5b3b9ef34db0d0bc7f8dc9446279b02594 100644 (file)
@@ -37,8 +37,6 @@
 #include "gtkintl.h"
 #include "gtkwindow.h"
 #include "gtkprivate.h"
-#include "gtkalias.h"
-
 
 #define BORDER_SPACING  0
 #define DEFAULT_IPADDING 1
@@ -938,6 +936,3 @@ gtk_menu_bar_set_child_pack_direction (GtkMenuBar       *menubar,
       g_object_notify (G_OBJECT (menubar), "child-pack-direction");
     }
 }
-
-#define __GTK_MENU_BAR_C__
-#include "gtkaliasdef.c"
index 76fab0d24d39f67db0d14075638b0056e35d1871..8e85ced860e70bf858b7b9cb8e5c2d199fc31246 100644 (file)
@@ -39,7 +39,6 @@
 #include "gtkbuildable.h"
 #include "gtkactivatable.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 
 typedef struct {
@@ -2203,8 +2202,3 @@ gtk_menu_item_get_use_underline (GtkMenuItem *menu_item)
 
   return FALSE;
 }
-
-
-
-#define __GTK_MENU_ITEM_C__
-#include "gtkaliasdef.c"
index 7c62a3dd29378390e0097ab44b2e5438de9d00e1..1a8b80d686a2b75e01a739f4bbb9cd33c8a53c76 100644 (file)
@@ -42,7 +42,6 @@
 #include "gtkwindow.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 #define MENU_SHELL_TIMEOUT   500
 
@@ -1860,6 +1859,3 @@ gtk_menu_shell_set_take_focus (GtkMenuShell *menu_shell,
       g_object_notify (G_OBJECT (menu_shell), "take-focus");
     }
 }
-
-#define __GTK_MENU_SHELL_C__
-#include "gtkaliasdef.c"
index 460423d34844d4fafe8a50b24ff079a853e67ced..08650166c5e6f8de51d632aa9822c7e8134d1e15 100644 (file)
@@ -30,7 +30,6 @@
 #include "gtkmain.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 
 #define GTK_MENU_TOOL_BUTTON_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), GTK_TYPE_MENU_TOOL_BUTTON, GtkMenuToolButtonPrivate))
@@ -629,6 +628,3 @@ gtk_menu_tool_button_set_arrow_tooltip_markup (GtkMenuToolButton *button,
 
   gtk_widget_set_tooltip_markup (button->priv->arrow_button, markup);
 }
-
-#define __GTK_MENU_TOOL_BUTTON_C__
-#include "gtkaliasdef.c"
index 408cb44b86c4cc2dbc336802d5c38d7280c1361e..2bd1d14396507fe1b6db7bd14ec1ccfd17ac7e65 100644 (file)
@@ -39,7 +39,6 @@
 #include "gtkiconfactory.h"
 #include "gtkintl.h"
 #include "gtkprivate.h"
-#include "gtkalias.h"
 
 /**
  * SECTION:gtkmessagedialog
@@ -1034,6 +1033,3 @@ gtk_message_dialog_style_set (GtkWidget *widget,
 
   GTK_WIDGET_CLASS (gtk_message_dialog_parent_class)->style_set (widget, prev_style);
 }
-
-#define __GTK_MESSAGE_DIALOG_C__
-#include "gtkaliasdef.c"
index 93d8421837edb964f8e46454ec660181d559fc3a..d0b4321e38568ca3c4e14ee1725f72925ea7df0f 100644 (file)
@@ -29,7 +29,6 @@
 #include "gtkmisc.h"
 #include "gtkintl.h"
 #include "gtkprivate.h"
-#include "gtkalias.h"
 
 
 enum {
@@ -336,6 +335,3 @@ gtk_misc_realize (GtkWidget *widget)
       gdk_window_set_back_pixmap (widget->window, NULL, TRUE);
     }
 }
-
-#define __GTK_MISC_C__
-#include "gtkaliasdef.c"
index 6434e144026364d43677fd3d5f16c1270ee388e6..6f85d04f6e63d4a194524a256269ba401def97c1 100644 (file)
@@ -20,7 +20,6 @@
  */
 
 #include "gtkmnemonichash.h"
-#include "gtkalias.h"
 
 struct _GtkMnemnonicHash
 {
index b0b0e7e18aad27689dbe6dc5cf5928ef780fa3a3..b1c958cb4bfb89de7d96ae3f996cd9d9f68db1d7 100644 (file)
@@ -27,7 +27,6 @@
 #include "gtkdebug.h"
 #include "gtkprivate.h" /* GTK_LIBDIR */
 #include "gtkintl.h" 
-#include "gtkalias.h"
 
 #include <gmodule.h>
 
index a20c8cf428a08e7041501c3bc59bcad6b3439f32..3ba793080862f30a7a60916b3fa22a8ab655d282 100644 (file)
@@ -44,9 +44,6 @@
 
 #include "gtkmountoperationprivate.h"
 
-#include "gtkalias.h"
-
-
 /* ---------------------------------------------------------------------------------------------------- */
 /* these functions are based on code from libwnck (LGPLv2) */
 
index d611631bb818a8ebf3e2128d88e6309bf8abfb8c..120ee69463b4f8cc1d7b3809449c576c10b288ae 100644 (file)
@@ -53,7 +53,6 @@
 #include "gtkicontheme.h"
 #include "gtkimagemenuitem.h"
 #include "gtkmain.h"
-#include "gtkalias.h"
 
 /**
  * SECTION:filesystem
@@ -1525,6 +1524,3 @@ gtk_mount_operation_get_screen (GtkMountOperation *op)
   else
     return gdk_screen_get_default ();
 }
-
-#define __GTK_MOUNT_OPERATION_C__
-#include "gtkaliasdef.c"
index ae8dbdac30274f2d2dbda3394a7ef45089c41800..e9810b5a79166b6e09fcd23963075ad88d9dddc3 100644 (file)
@@ -46,8 +46,6 @@
 #include "gtkdnd.h"
 #include "gtkbuildable.h"
 
-#include "gtkalias.h"
-
 #define SCROLL_DELAY_FACTOR   5
 #define SCROLL_THRESHOLD      12
 #define DND_THRESHOLD_MULTIPLIER 4
@@ -7713,6 +7711,3 @@ gtk_notebook_set_action_widget (GtkNotebook *notebook,
 
   gtk_widget_queue_resize (GTK_WIDGET (notebook));
 }
-
-#define __GTK_NOTEBOOK_C__
-#include "gtkaliasdef.c"
index e4bc937d4f86a07c94bef1a6f27885a702282678..0b26cfd3f871a267f8ddeda20678257551d7552f 100644 (file)
@@ -35,9 +35,6 @@
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
 
-#include "gtkalias.h"
-
-
 /**
  * SECTION:gtkobject
  * @Short_description: The base class of the GTK+ type hierarchy
@@ -228,6 +225,3 @@ gtk_object_finalize (GObject *gobject)
   
   G_OBJECT_CLASS (gtk_object_parent_class)->finalize (gobject);
 }
-
-#define __GTK_OBJECT_C__
-#include "gtkaliasdef.c"
index 0633a787a32139bd702ae438c001bddc55717127..c62e2eb22562004a40d85f75564378853cae7475 100644 (file)
@@ -19,7 +19,6 @@
  */
 
 #include "gtkoffscreenwindow.h"
-#include "gtkalias.h"
 
 /**
  * SECTION:gtkoffscreenwindow
@@ -312,6 +311,3 @@ gtk_offscreen_window_get_pixbuf (GtkOffscreenWindow *offscreen)
 
   return pixbuf;
 }
-
-#define __GTK_OFFSCREEN_WINDOW_C__
-#include "gtkaliasdef.c"
index 636f65da8f2d6a202e776cc7d7aba0ade45a9def..33a59df2a774db674597573866a39a92c078e034 100644 (file)
@@ -26,7 +26,6 @@
 #include "gtkorientable.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 
 /**
@@ -111,6 +110,3 @@ gtk_orientable_get_orientation (GtkOrientable *orientable)
 
   return orientation;
 }
-
-#define __GTK_ORIENTABLE_C__
-#include "gtkaliasdef.c"
index 0e8c153b7749c1ee11b308e5ccc6c6d17e6f800b..a69e0821c56890522e510b74fed6bccaeb7717ac 100644 (file)
@@ -25,7 +25,6 @@
 #include "gtkprintoperation.h" /* for GtkPrintError */
 #include "gtkintl.h"
 #include "gtktypebuiltins.h"
-#include "gtkalias.h"
 
 #define KEYFILE_GROUP_NAME "Page Setup"
 
@@ -782,6 +781,3 @@ gtk_page_setup_to_key_file (GtkPageSetup *setup,
                         "Orientation", orientation);
   g_free (orientation);
 }
-
-#define __GTK_PAGE_SETUP_C__
-#include "gtkaliasdef.c"
index 19a19a77e1b9f0280a598cf5aa4759ef7790603e..7543febb210338a64e53ecb904ec00c8df7812b3 100644 (file)
@@ -54,8 +54,6 @@
 #include "gtkprintbackend.h"
 #include "gtkpapersize.h"
 #include "gtkprintutils.h"
-#include "gtkalias.h"
-
 
 /**
  * SECTION:gtkpagesetupunixdialog
@@ -1207,6 +1205,3 @@ gtk_page_setup_unix_dialog_get_print_settings (GtkPageSetupUnixDialog *dialog)
 
   return priv->print_settings;
 }
-
-#define __GTK_PAGE_SETUP_UNIX_DIALOG_C__
-#include "gtkaliasdef.c"
index e17131f8f32edf2486810afffdfdb9b0f1bfd7e2..f1103fbcbc628acf241d55e7f9734dace8706032 100644 (file)
@@ -35,7 +35,7 @@
 #include "gtkwindow.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
+
 
 enum {
   PROP_0,
@@ -2247,6 +2247,3 @@ gtk_paned_get_handle_window (GtkPaned *paned)
 
   return paned->handle;
 }
-
-#define __GTK_PANED_C__
-#include "gtkaliasdef.c"
index 894dca0b87969dae23a89052b1ff2407e405f389..bc81d7b2712302180ac9b946381e8b4aeee46231 100644 (file)
@@ -31,7 +31,6 @@
 #include "gtkprintutils.h"
 #include "gtkprintoperation.h"  /* for GtkPrintError */
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 #include "paper_names_offsets.c"
 
@@ -920,7 +919,3 @@ gtk_paper_size_to_key_file (GtkPaperSize *size,
   g_key_file_set_double (key_file, group_name,
                         "Height", gtk_paper_size_get_height (size, GTK_UNIT_MM));
 }
-
-
-#define __GTK_PAPER_SIZE_C__
-#include "gtkaliasdef.c"
index 10c1f3cb8afe947bc5e231b60d02e0bfcd4680dd..08236dd706b420e351063c779e86918b7df374a2 100644 (file)
@@ -33,7 +33,7 @@
 #include "gtkhbox.h"
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
-#include "gtkalias.h"
+
 
 enum {
   PATH_CLICKED,
@@ -1834,6 +1834,3 @@ _gtk_path_bar_down (GtkPathBar *path_bar)
        }
     }
 }
-
-#define __GTK_PATH_BAR_C__
-#include "gtkaliasdef.c"
index 92c5f109562fadd180e2d045eb594cff06457e2a..3bd1024aab62919802251e96dc044753fd518a9a 100644 (file)
@@ -27,7 +27,6 @@
 
 #include "gtkplug.h"
 #include "gtkplugprivate.h"
-#include "gtkalias.h"
 
 GdkNativeWindow
 _gtk_plug_windowing_get_id (GtkPlug *plug)
index 98440c1cfa0cf50378c65d315f0bf58a8e19ad3f..edcaaf4ddee308ea11d6c6bd52c8f694d46852f8 100644 (file)
@@ -33,7 +33,6 @@
 #include "win32/gdkwin32.h"
 
 #include "gtkwin32embed.h"
-#include "gtkalias.h"
 
 #if defined(_MSC_VER) && (WINVER < 0x0500)
 #ifndef GA_PARENT
index d0df6f54c5cba39cdecb48162011186db694d84a..f7534935baf3aa89c9609ff6e929e1d5465a4dd4 100644 (file)
@@ -49,7 +49,6 @@
 #include "x11/gdkx.h"
 
 #include "gtkxembed.h"
-#include "gtkalias.h"
 
 static void xembed_set_info            (GdkWindow     *window,
                                        unsigned long  flags);
index 52d2b925f9582ddcbf2fda10c1e275be10017e50..3a30ab58e8ce5d2be67e9946cb67a3ae2179781b 100644 (file)
@@ -34,8 +34,6 @@
 #include "gtkprivate.h"
 #include "gtkplugprivate.h"
 
-#include "gtkalias.h"
-
 /**
  * SECTION:gtkplug
  * @Short_description: Toplevel for embedding into other processes
@@ -1064,6 +1062,3 @@ _gtk_plug_focus_first_last (GtkPlug          *plug,
 
   gtk_widget_child_focus (GTK_WIDGET (plug), direction);
 }
-
-#define __GTK_PLUG_C__
-#include "gtkaliasdef.c"
index b7faae20f4b0a45e234355845401ebd5c399d11a..7801a7f880f315ca0fb3e85b8a674b8403131131 100644 (file)
@@ -25,7 +25,6 @@
 
 #include "config.h"
 #include "gtkprint-win32.h"
-#include "gtkalias.h"
 
 void
 gtk_print_win32_devnames_free (GtkPrintWin32Devnames *devnames)
@@ -155,7 +154,3 @@ gtk_print_win32_devnames_from_printer_name (const char *printer_name)
 
   return devnames;
 }
-
-
-#define __GTK_PRINT_WIN32_C__
-#include "gtkaliasdef.c"
index c487d33f4d4ed1e0fee388df30fc63e0ed19eb5d..bdb6a1d2cc1a21f543be519a443cd9687ce435e7 100644 (file)
@@ -28,7 +28,6 @@
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
 #include "gtkprintbackend.h"
-#include "gtkalias.h"
 
 #define GTK_PRINT_BACKEND_GET_PRIVATE(o)  \
    (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTK_TYPE_PRINT_BACKEND, GtkPrintBackendPrivate))
@@ -837,7 +836,3 @@ gtk_print_backend_destroy (GtkPrintBackend *print_backend)
    */
   g_object_run_dispose (G_OBJECT (print_backend));
 }
-
-
-#define __GTK_PRINT_BACKEND_C__
-#include "gtkaliasdef.c"
index cdf04d7c2f539bb3d371ee13d2413622c21fcfab..105f1182621ea1a93492766d9a3e3f3d836caa33 100644 (file)
@@ -20,7 +20,6 @@
 
 #include "config.h"
 #include "gtkprintoperation-private.h"
-#include "gtkalias.h"
 
 typedef struct _GtkPrintContextClass GtkPrintContextClass;
 
@@ -517,7 +516,3 @@ gtk_print_context_create_pango_layout (GtkPrintContext *context)
 
   return layout;
 }
-
-
-#define __GTK_PRINT_CONTEXT_C__
-#include "gtkaliasdef.c"
index 928896ab1fdc433d33bd6f11ef237831a0fce972..d43e7b1342798f3335cfa70d9093f6e9d23436ee 100644 (file)
@@ -29,8 +29,6 @@
 #include "gtkprinter-private.h"
 #include "gtkprintbackend.h"
 #include "gtkprintjob.h"
-#include "gtkalias.h"
-
 
 /**
  * SECTION:gtkprinter
@@ -1281,7 +1279,3 @@ gtk_print_capabilities_get_type (void)
 
   return etype;
 }
-
-
-#define __GTK_PRINTER_C__
-#include "gtkaliasdef.c"
index 47fcd32755e5bebbde123c299cffe98e727b0310..fbf2545b6d06a07180e64c33a211bb356d4b5f5a 100644 (file)
@@ -23,7 +23,6 @@
 #include <gmodule.h>
 
 #include "gtkprinteroption.h"
-#include "gtkalias.h"
 
 /*****************************************
  *            GtkPrinterOption           *
@@ -232,7 +231,3 @@ gtk_printer_option_get_activates_default (GtkPrinterOption *option)
 
   return option->activates_default;
 }
-
-
-#define __GTK_PRINTER_OPTION_C__
-#include "gtkaliasdef.c"
index 5a30c7216453150a66fef79a914a42d9613c1c66..d32d3b8c7d3f21d7997fa1f202f6e9195c9d1e83 100644 (file)
@@ -24,7 +24,6 @@
 #include <gmodule.h>
 
 #include "gtkprinteroptionset.h"
-#include "gtkalias.h"
 
 /*****************************************
  *         GtkPrinterOptionSet    *
@@ -192,7 +191,3 @@ gtk_printer_option_set_foreach (GtkPrinterOptionSet *set,
 {
   gtk_printer_option_set_foreach_in_group (set, NULL, func, user_data);
 }
-
-
-#define __GTK_PRINTER_OPTION_SET_C__
-#include "gtkaliasdef.c"
index a4e6f0cf433ae185e170e7e229ea5cc5658d76f2..8831dfc0925d92afd7f62950774f43c327b00962 100644 (file)
@@ -41,7 +41,6 @@
 #include "gtkprivate.h"
 
 #include "gtkprinteroptionwidget.h"
-#include "gtkalias.h"
 
 #define GTK_PRINTER_OPTION_WIDGET_GET_PRIVATE(o)  \
    (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTK_TYPE_PRINTER_OPTION_WIDGET, GtkPrinterOptionWidgetPrivate))
@@ -927,6 +926,3 @@ gtk_printer_option_widget_get_value (GtkPrinterOptionWidget *widget)
   
   return "";
 }
-
-#define __GTK_PRINTER_OPTION_WIDGET_C__
-#include "gtkaliasdef.c"
index af76152718adf2f5993d164a72aeef1673ef7ca2..e30deb00c651798b1b66db0b1dcf04936af36376 100644 (file)
@@ -37,7 +37,6 @@
 #include "gtkprinter.h"
 #include "gtkprinter-private.h"
 #include "gtkprintbackend.h"
-#include "gtkalias.h"
 
 #ifndef O_BINARY
 #define O_BINARY 0
@@ -684,7 +683,3 @@ gtk_print_job_send (GtkPrintJob             *job,
                                  priv->spool_io,
                                   callback, user_data, dnotify);
 }
-
-
-#define __GTK_PRINT_JOB_C__
-#include "gtkaliasdef.c"
index 896871ab22867f3b843b900ce4e364e3afcbf8c8..d43db01e5128d05e0caed127ef6756b2cf9701a4 100644 (file)
@@ -44,7 +44,7 @@
 #include "gtkprintjob.h"
 #include "gtklabel.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
+
 
 typedef struct 
 {
@@ -1206,6 +1206,3 @@ find_printer (const gchar *printer,
   if (finder->backends == NULL && !finder->found_printer)
     g_idle_add (find_printer_idle, finder);
 }
-
-#define __GTK_PRINT_OPERATION_UNIX_C__
-#include "gtkaliasdef.c"
index 76f8a696ae1dcd1cbb39a82badb4b8ce56190f64..ccb3cd929b9994c7440bafae5c3677f78b9486f5 100644 (file)
@@ -43,7 +43,6 @@
 #include "gtkstock.h"
 #include "gtk.h"
 #include "gtkwin32embedwidget.h"
-#include "gtkalias.h"
 
 #define MAX_PAGE_RANGES 20
 #define STATUS_POLLING_TIME 2000
@@ -2134,6 +2133,3 @@ gtk_print_run_page_setup_dialog_async (GtkWindow            *parent,
   done_cb (new_page_setup, data);
   g_object_unref (new_page_setup);
 }
-
-#define __GTK_PRINT_OPERATION_WIN32_C__
-#include "gtkaliasdef.c"
index a633bcdb7e69a9458a13668f0b81db1f3b72ffda..60a2df2c685f7c99deb692aa2a0cadd9cef82ac7 100644 (file)
@@ -31,7 +31,6 @@
 #include "gtkintl.h"
 #include "gtkprivate.h"
 #include "gtkmessagedialog.h"
-#include "gtkalias.h"
 
 #define SHOW_PROGRESS_TIME 1200
 
@@ -3308,6 +3307,3 @@ gtk_print_operation_get_n_pages_to_print (GtkPrintOperation *op)
 
   return op->priv->nr_of_pages_to_print;
 }
-
-#define __GTK_PRINT_OPERATION_C__
-#include "gtkaliasdef.c"
index 3b0ef7c63cb07aef9349570b301488b93f8e7de2..f4c6867a06f37fbd1e75ec3b301b9217d60b6129 100644 (file)
@@ -23,7 +23,6 @@
 #include "gtkprintoperationpreview.h"
 #include "gtkmarshalers.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 
 static void gtk_print_operation_preview_base_init (gpointer g_iface);
@@ -176,7 +175,3 @@ gtk_print_operation_preview_is_selected (GtkPrintOperationPreview *preview,
 
   return GTK_PRINT_OPERATION_PREVIEW_GET_IFACE (preview)->is_selected (preview, page_nr);
 }
-
-
-#define __GTK_PRINT_OPERATION_PREVIEW_C__
-#include "gtkaliasdef.c"
index 6d1c818c2dc8b101d97a554d7771cc13e910bd4f..5cbcab2da71f0214cf59c8aea5962920904da78d 100644 (file)
@@ -25,7 +25,6 @@
 #include <gtk/gtk.h>
 #include "gtkprintsettings.h"
 #include "gtkprintutils.h"
-#include "gtkalias.h"
 
 
 typedef struct _GtkPrintSettingsClass GtkPrintSettingsClass;
@@ -1921,7 +1920,3 @@ gtk_print_settings_to_key_file (GtkPrintSettings  *settings,
                              (GtkPrintSettingsFunc) add_value_to_key_file,
                              &data);
 }
-
-
-#define __GTK_PRINT_SETTINGS_C__
-#include "gtkaliasdef.c"
index c3edb789a721c28060236436c2de092597e0e9d2..b43ed84a344f853db99325dc5a1bb716b5d96ecc 100644 (file)
@@ -56,7 +56,6 @@
 #include "gtkprintunixdialog.h"
 #include "gtkprinteroptionwidget.h"
 #include "gtkprintutils.h"
-#include "gtkalias.h"
 
 #include "gtkmessagedialog.h"
 #include "gtkbutton.h"
@@ -4427,6 +4426,3 @@ gtk_print_unix_dialog_get_embed_page_setup (GtkPrintUnixDialog *dialog)
 
   return dialog->priv->embed_page_setup;
 }
-
-#define __GTK_PRINT_UNIX_DIALOG_C__
-#include "gtkaliasdef.c"
index 33896a55a5e6227c55f23a4321e21b6d8a52da3c..dced6e8a4deb10d56687e16ac76f9cea33b8c88d 100644 (file)
@@ -20,7 +20,6 @@
 
 #include "config.h"
 #include "gtkprintutils.h"
-#include "gtkalias.h"
 
 gdouble
 _gtk_print_convert_to_mm (gdouble len, 
index 5ea054329b4e1ed4ad5cf1d05232c797e6fbd38c..500f2d1aac86b384d496e11b595f3aeaf464789f 100644 (file)
@@ -31,7 +31,6 @@
 #include "gtkprogressbar.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 
 #define MIN_HORIZONTAL_BAR_WIDTH   150
@@ -1276,7 +1275,3 @@ gtk_progress_bar_get_ellipsize (GtkProgressBar *pbar)
 
   return pbar->ellipsize;
 }
-
-
-#define __GTK_PROGRESS_BAR_C__
-#include "gtkaliasdef.c"
index 265d9ffa222bb13fac85e1f3bb43ffd341c5da90..e8945591a4b85104eed90e662b52f019c6ef62b9 100644 (file)
@@ -22,7 +22,6 @@
 
 #include "gtkquartz.h"
 #include <gdk/quartz/gdkquartz.h>
-#include "gtkalias.h"
 
 NSImage *
 _gtk_quartz_create_image_from_pixbuf (GdkPixbuf *pixbuf)
index f44c2b546c1a08aa3940eebd952d1c40c8977d4d..ac31219393acb4a70649d25358e70e714a1e3686 100644 (file)
@@ -36,8 +36,6 @@
 #include "gtktoggletoolbutton.h"
 #include "gtkintl.h"
 #include "gtkprivate.h"
-#include "gtkalias.h"
-
 
 /**
  * SECTION:gtkradioaction
@@ -594,6 +592,3 @@ gtk_radio_action_set_current_value (GtkRadioAction *action,
     g_warning ("Radio group does not contain an action with value '%d'",
               current_value);
 }
-
-#define __GTK_RADIO_ACTION_C__
-#include "gtkaliasdef.c"
index 24300334c990e1afaf1c96466f286f9fd6477abe..4343779ea062bcfcc6cd12417a39ce4086b10bbe 100644 (file)
@@ -30,8 +30,6 @@
 #include "gtkradiobutton.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
-
 
 /**
  * SECTION:gtkradiobutton
@@ -878,6 +876,3 @@ gtk_radio_button_draw_indicator (GtkCheckButton *check_button,
                        x, y, indicator_size, indicator_size);
     }
 }
-
-#define __GTK_RADIO_BUTTON_C__
-#include "gtkaliasdef.c"
index 9bb5c112fd8310d544f5b2853c197fc25edd3621..4cbdc0e5d996f527f96c640240cb8d2eaff131df 100644 (file)
@@ -31,7 +31,6 @@
 #include "gtkactivatable.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 
 enum {
@@ -489,6 +488,3 @@ gtk_radio_menu_item_activate (GtkMenuItem *menu_item)
 
   gtk_widget_queue_draw (GTK_WIDGET (radio_menu_item));
 }
-
-#define __GTK_RADIO_MENU_ITEM_C__
-#include "gtkaliasdef.c"
index 1aa37da1fb95ab409fba7692ea5a8732db4f6eab..c39758761febef5761d38a21a136bc272ada633b 100644 (file)
@@ -25,7 +25,7 @@
 #include "gtkradiobutton.h"
 #include "gtkintl.h"
 #include "gtkprivate.h"
-#include "gtkalias.h"
+
 
 enum {
   PROP_0,
@@ -252,6 +252,3 @@ gtk_radio_tool_button_set_group (GtkRadioToolButton *button,
 
   gtk_radio_button_set_group (get_radio_button (button), group);
 }
-
-#define __GTK_RADIO_TOOL_BUTTON_C__
-#include "gtkaliasdef.c"
index 01c98d61fde4e815ffb897bacf330ce57e712753..b3fd663b6a73a60aca47b87809b8f5ac88b67388 100644 (file)
@@ -39,8 +39,6 @@
 #include "gtkscrollbar.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
-
 
 /**
  * SECTION:gtkrange
@@ -3974,6 +3972,3 @@ _gtk_range_get_stop_positions (GtkRange  *range,
 
   return range->layout->n_marks;
 }
-
-#define __GTK_RANGE_C__
-#include "gtkaliasdef.c"
index c33a9edcfe2409993394d3a1c4b81c8f30b1cd8c..fdd45ad81223e95d04b9a199205bda1cebb2baed 100644 (file)
@@ -20,7 +20,6 @@
 #include "config.h"
 #include "gtkrbtree.h"
 #include "gtkdebug.h"
-#include "gtkalias.h"
 
 static GtkRBNode * _gtk_rbnode_new                (GtkRBTree  *tree,
                                                   gint        height);
index 32b51e144e7131feca2f34affd63f63d96b17f68..19d0f6cd87fe54550bee1e3456f3446a3606f45e 100644 (file)
@@ -56,8 +56,6 @@
 #include "gtksettings.h"
 #include "gtkwindow.h"
 
-#include "gtkalias.h"
-
 #ifdef G_OS_WIN32
 #include <io.h>
 #endif
@@ -4880,6 +4878,3 @@ gtk_rc_parse (const gchar *filename)
 }
 
 #endif
-
-#define __GTK_RC_C__
-#include "gtkaliasdef.c"
index 458d23f01903940cf69db92cc87787fff147198a..41f2a264713bbc74d38edad68698a3d5025f711a 100644 (file)
@@ -30,8 +30,6 @@
 #include "gtkrecentchooserutils.h"
 #include "gtkrecentchooserprivate.h"
 #include "gtkprivate.h"
-#include "gtkalias.h"
-
 
 /**
  * SECTION:gtkrecentaction
@@ -782,6 +780,3 @@ gtk_recent_action_set_show_numbers (GtkRecentAction *action,
       g_object_unref (action);
     }
 }
-
-#define __GTK_RECENT_ACTION_C__
-#include "gtkaliasdef.c"
index d381df328aa2a21ea63620e5047063b263aa4fd4..8bcc8e25412749bad668c53298b5165d896a97d8 100644 (file)
@@ -30,8 +30,6 @@
 #include "gtktypebuiltins.h"
 #include "gtkprivate.h"
 #include "gtkmarshalers.h"
-#include "gtkalias.h"
-
 
 /**
  * SECTION:gtkrecentchooser
@@ -1148,6 +1146,3 @@ _gtk_recent_chooser_get_use_action_appearance (GtkRecentChooser *recent_chooser)
 {
   return !GPOINTER_TO_INT (g_object_get_qdata (G_OBJECT (recent_chooser), quark_gtk_use_action_appearance));
 }
-
-#define __GTK_RECENT_CHOOSER_C__
-#include "gtkaliasdef.c"
index 7cae6898f1c2cdbe766725b68e2450a0dee79276..612a8ec1df49866b0c65ffb0f0604d2d5536e2e1 100644 (file)
@@ -75,7 +75,7 @@
 #include "gtkrecentchooserdefault.h"
 
 #include "gtkprivate.h"
-#include "gtkalias.h"
+
 
 enum 
 {
index c86910f3fa57abb6d1e7abc6a60d5155d6aecf69..e8f5b6b5ac65fd1a6147af665fe7af5fa9a2aafa 100644 (file)
@@ -25,7 +25,6 @@
 #include "gtkrecentchooserutils.h"
 #include "gtkrecentmanager.h"
 #include "gtktypebuiltins.h"
-#include "gtkalias.h"
 
 #include <stdarg.h>
 
@@ -395,6 +394,3 @@ gtk_recent_chooser_dialog_new_for_manager (const gchar      *title,
   
   return result;
 }
-
-#define __GTK_RECENT_CHOOSER_DIALOG_C__
-#include "gtkaliasdef.c"
index f77643b6586501d44ad997cb81540e14b7aa00fa..d922f923cdb2db44a739c72d78fb99f1a9610ae2 100644 (file)
@@ -45,8 +45,6 @@
 #include "gtkactivatable.h"
 #include "gtktypebuiltins.h"
 #include "gtkprivate.h"
-#include "gtkalias.h"
-
 
 /**
  * SECTION:gtkrecentchoosermenu
@@ -1321,6 +1319,3 @@ gtk_recent_chooser_menu_set_show_numbers (GtkRecentChooserMenu *menu,
   menu->priv->show_numbers = show_numbers;
   g_object_notify (G_OBJECT (menu), "show-numbers");
 }
-
-#define __GTK_RECENT_CHOOSER_MENU_C__
-#include "gtkaliasdef.c"
index f0a000902213338ab1209fcfd0855675c6e62de0..54f0ff5ce5e3889b101acacfec22f02d2ee7403a 100644 (file)
@@ -27,7 +27,6 @@
 #include "config.h"
 
 #include "gtkrecentchooserutils.h"
-#include "gtkalias.h"
 
 /* Methods */
 static void      delegate_set_sort_func              (GtkRecentChooser  *chooser,
index 44169a44ea00eb60eda261f355566103e9f4b7c8..cc05491c945414d52056c0e42ec8b4208cc51bff 100644 (file)
@@ -24,8 +24,6 @@
 #include "gtkrecentchooserdefault.h"
 #include "gtkrecentchooserutils.h"
 #include "gtktypebuiltins.h"
-#include "gtkalias.h"
-
 
 /**
  * SECTION:gtkrecentchooserwidget
@@ -208,6 +206,3 @@ gtk_recent_chooser_widget_new_for_manager (GtkRecentManager *manager)
                       "recent-manager", manager,
                       NULL);
 }
-
-#define __GTK_RECENT_CHOOSER_WIDGET_C__
-#include "gtkaliasdef.c"
index 5de81cf20dfaa4caf84fe82da87720070a8f756f..fd9d0b313c15f7c5bbd1c93f1fbaf357e6a2b9bf 100644 (file)
@@ -25,8 +25,6 @@
 #include "gtkintl.h"
 #include "gtkprivate.h"
 
-#include "gtkalias.h"
-
 typedef struct _GtkRecentFilterClass GtkRecentFilterClass;
 typedef struct _FilterRule FilterRule;
 
@@ -563,6 +561,3 @@ gtk_recent_filter_filter (GtkRecentFilter           *filter,
   
   return FALSE;
 }
-
-#define __GTK_RECENT_FILTER_C__
-#include "gtkaliasdef.c"
index a9ee6d37e7aa426348a7d51be24f3f4cec63d24f..83642357e08caf921bf72ac1b33ff614375b14cc 100644 (file)
@@ -39,7 +39,6 @@
 #include "gtktypebuiltins.h"
 #include "gtkprivate.h"
 #include "gtkmarshalers.h"
-#include "gtkalias.h"
 
 /* the file where we store the recently used items */
 #define GTK_RECENTLY_USED_FILE ".recently-used.xbel"
@@ -2324,6 +2323,3 @@ _gtk_recent_manager_sync (void)
       gtk_recent_manager_real_changed (recent_manager_singleton);
     }
 }
-
-#define __GTK_RECENT_MANAGER_C__
-#include "gtkaliasdef.c"
index 43c23c5eecd1c88f744cac8482891250403d1aee..2e407816f4e856e9d3d61dbb8d085acd56aabb8a 100644 (file)
@@ -33,8 +33,6 @@
 #include "gtkruler.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
-
 
 #define RULER_WIDTH           14
 #define MINIMUM_INCR          5
@@ -907,6 +905,3 @@ gtk_ruler_real_draw_pos (GtkRuler *ruler)
        }
     }
 }
-
-#define __GTK_RULER_C__
-#include "gtkaliasdef.c"
index c2f0f3520cc4e853661c67b37daac43301cf83ff..628a9986c02698ef60a083e9d7009c8c931350bf 100644 (file)
@@ -40,8 +40,6 @@
 #include "gtkintl.h"
 #include "gtkbuildable.h"
 #include "gtkbuilderprivate.h"
-#include "gtkalias.h"
-
 
 #define        MAX_DIGITS      (64)    /* don't change this,
                                 * a) you don't need to and
@@ -1681,6 +1679,3 @@ gtk_scale_buildable_custom_finished (GtkBuildable *buildable,
       g_slice_free (MarksSubparserData, marks_data);
     }
 }
-
-#define __GTK_SCALE_C__
-#include "gtkaliasdef.c"
index dce3937a257e5025f2aeb8dc94e8a230a9753e6f..efbfffd723d4b99a25f7f34697eafcd98a306d47 100644 (file)
@@ -58,8 +58,6 @@
 #include "gtkwindow.h"
 
 #include "gtkintl.h"
-#include "gtkalias.h"
-
 
 /**
  * SECTION:gtkscalebutton
@@ -1607,6 +1605,3 @@ gtk_scale_button_scale_value_changed (GtkRange *range)
   g_signal_emit (button, signals[VALUE_CHANGED], 0, value);
   g_object_notify (G_OBJECT (button), "value");
 }
-
-#define __GTK_SCALE_BUTTON_C__
-#include "gtkaliasdef.c"
index 6bd2f6150ea9886be6f0385a9ceaa8af7cee64f9..34ef5b60ce2b1b4bca8d911f4c9e3f5f9af33b10 100644 (file)
@@ -30,7 +30,6 @@
 #include "gtkscrollbar.h"
 #include "gtkintl.h"
 #include "gtkprivate.h"
-#include "gtkalias.h"
 
 static void gtk_scrollbar_style_set (GtkWidget *widget,
                                      GtkStyle  *previous);
@@ -148,7 +147,3 @@ gtk_scrollbar_new (GtkOrientation  orientation,
                        "adjustment",  adjustment,
                        NULL);
 }
-
-
-#define __GTK_SCROLLBAR_C__
-#include "gtkaliasdef.c"
index 612ff23ab8b9f5838f4355f045eb59260d730460..674eb85e5e37adaeaffccd7372bd568e16f26d7a 100644 (file)
@@ -34,8 +34,6 @@
 #include "gtkwindow.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
-
 
 /* scrolled window policy and size requisition handling:
  *
@@ -1903,6 +1901,3 @@ gtk_scrolled_window_get_width_for_height (GtkSizeRequest *widget,
 
   GTK_SIZE_REQUEST_GET_IFACE (widget)->get_width (widget, minimum_width, natural_width);
 }
-
-#define __GTK_SCROLLED_WINDOW_C__
-#include "gtkaliasdef.c"
index 5c7db9cc7fceaf7944076372df3a1e64c5cf5282..5d6ad033c95e13ebdad35843fc8278a183d0e3b8 100644 (file)
@@ -70,8 +70,6 @@
 #include "win32/gdkwin32.h"
 #endif
 
-#include "gtkalias.h"
-
 #undef DEBUG_SELECTION
 
 /* Maximum size of a sent chunk, in bytes. Also the default size of
@@ -3157,6 +3155,3 @@ gtk_selection_bytes_per_item (gint format)
     }
   return 0;
 }
-
-#define __GTK_SELECTION_C__
-#include "gtkaliasdef.c"
index 58ef60f1ade9032848409c6048c7bbefe6babc42..45e93f3fb8e508f93863fb1d230a999a4dce32da 100644 (file)
@@ -30,8 +30,6 @@
 #include "gtkseparator.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
-
 
 /**
  * SECTION:gtkseparator
@@ -265,7 +263,3 @@ gtk_separator_new (GtkOrientation orientation)
                        "orientation", orientation,
                        NULL);
 }
-
-
-#define __GTK_SEPARATOR_C__
-#include "gtkaliasdef.c"
index d096b5f33c2b398c0a20685baf15b358efa38389..44ebd97dfa03f7a73d0859764e999a906ae99e10 100644 (file)
@@ -26,8 +26,6 @@
 
 #include "config.h"
 #include "gtkseparatormenuitem.h"
-#include "gtkalias.h"
-
 
 /**
  * SECTION:gtkseparatormenuitem
@@ -65,6 +63,3 @@ gtk_separator_menu_item_new (void)
 {
   return g_object_new (GTK_TYPE_SEPARATOR_MENU_ITEM, NULL);
 }
-
-#define __GTK_SEPARATOR_MENU_ITEM_C__
-#include "gtkaliasdef.c"
index 2a35efe5f012e9eeedb2abb2b034b7afc0812d9d..db53893536b33c59835d51edfe0c2dc9d1c02621 100644 (file)
@@ -25,8 +25,6 @@
 #include "gtkintl.h"
 #include "gtktoolbar.h"
 #include "gtkprivate.h"
-#include "gtkalias.h"
-
 
 /**
  * SECTION:gtkseparatortoolitem
@@ -300,6 +298,3 @@ gtk_separator_tool_item_set_draw (GtkSeparatorToolItem *item,
       g_object_notify (G_OBJECT (item), "draw");
     }
 }
-
-#define __GTK_SEPARATOR_TOOL_ITEM_C__
-#include "gtkaliasdef.c"
index 99dcb844ee84f0c336c203509b95ab707d266710..581806983976f75079eed1de2b492f7d731903fe 100644 (file)
@@ -28,7 +28,6 @@
 #include "gtkintl.h"
 #include "gtkwidget.h"
 #include "gtkprivate.h"
-#include "gtkalias.h"
 
 #ifdef GDK_WINDOWING_X11
 #include "x11/gdkx.h"
@@ -2503,7 +2502,3 @@ get_color_scheme (GtkSettings *settings)
 
   return g_string_free (string, FALSE);
 }
-
-
-#define __GTK_SETTINGS_C__
-#include "gtkaliasdef.c"
index b2b56918a214ed2569131aee09b1e920dff4cd12..e4e5d50d4eef2b8fc0ba03e9ec392fb8f56a0410 100644 (file)
@@ -26,9 +26,6 @@
 
 #include "gtkshow.h"
 
-#include "gtkalias.h"
-
-
 /**
  * gtk_show_uri:
  * @screen: (allow-none): screen to show the uri on or %NULL for the default screen
@@ -75,7 +72,3 @@ gtk_show_uri (GdkScreen    *screen,
 
   return ret;
 }
-
-
-#define __GTK_SHOW_C__
-#include "gtkaliasdef.c"
index fa0be283c7ed7a2de068826406a003dc3f3b251e..6031200f142021899fa2c97da6571ed70d369c12 100644 (file)
@@ -26,7 +26,7 @@
 #include "gtksizegroup.h"
 #include "gtkbuildable.h"
 #include "gtksizerequest.h"
-#include "gtkalias.h"
+
 
 enum {
   PROP_0,
@@ -892,7 +892,3 @@ gtk_size_group_buildable_custom_finished (GtkBuildable  *buildable,
   g_slist_free (data->items);
   g_slice_free (GSListSubParserData, data);
 }
-
-
-#define __GTK_SIZE_GROUP_C__
-#include "gtkaliasdef.c"
index 5114a724f55afa7fe62ac661601ad0bd6d0327f9..d0adb8b219e0a11d2011baf836e3394014fb6844 100644 (file)
@@ -97,7 +97,6 @@
 #include "gtksizegroup.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 /* With GtkSizeRequest, a widget may be requested
  * its width for 2 or maximum 3 heights in one resize
@@ -534,8 +533,3 @@ gtk_size_request_get_size (GtkSizeRequest    *widget,
        }
     }
 }
-
-
-
-#define __GTK_SIZE_REQUEST_C__
-#include "gtkaliasdef.c"
index fbc8aedcfd8e663c6d12a8447cb434aa3ee68f40..b839048b8869cddd50b4e72cdc4d08140ef66d7c 100644 (file)
@@ -27,7 +27,6 @@
 
 #include "gtksocket.h"
 #include "gtksocketprivate.h"
-#include "gtkalias.h"
 
 GdkNativeWindow
 _gtk_socket_windowing_get_id (GtkSocket *socket)
index 40875097ee6a164f899ef6ef3bfd29ef7728d442..d8448fedd7005bbd6fba119a248208f2025b6660 100644 (file)
@@ -38,7 +38,6 @@
 #include "win32/gdkwin32.h"
 
 #include "gtkwin32embed.h"
-#include "gtkalias.h"
 
 GdkNativeWindow
 _gtk_socket_windowing_get_id (GtkSocket *socket)
index 5dbde457a812b8cdc5e7d7454e61d42924becbfe..8ea321aaef97e318158fe21ce683303f8ff884d5 100644 (file)
@@ -45,7 +45,6 @@
 #endif
 
 #include "gtkxembed.h"
-#include "gtkalias.h"
 
 static gboolean xembed_get_info     (GdkWindow     *gdk_window,
                                     unsigned long *version,
index 5e6a1fb8ec8c08b6b6e4e436d980d11081a67572..9d679d11d186eff9173c26c13d0339be9d77b5a0 100644 (file)
@@ -39,7 +39,6 @@
 #include "gtkdnd.h"
 #include "gtkintl.h"
 
-#include "gtkalias.h"
 
 /**
  * SECTION:gtksocket
@@ -1046,6 +1045,3 @@ _gtk_socket_advance_toplevel_focus (GtkSocket        *socket,
         return;
     }
 }
-
-#define __GTK_SOCKET_C__
-#include "gtkaliasdef.c"
index 7d1280aca953cc43529d0904a9c89f840c765fe2..316f76ae8e9b4fd79d7b6267c43d06388cdc0f8b 100644 (file)
@@ -42,7 +42,6 @@
 #include "gtksettings.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 #define MIN_SPIN_BUTTON_WIDTH 30
 #define MAX_TIMER_CALLS       5
@@ -2296,6 +2295,3 @@ gtk_spin_button_update (GtkSpinButton *spin_button)
   else
     gtk_spin_button_set_value (spin_button, val);
 }
-
-#define __GTK_SPIN_BUTTON_C__
-#include "gtkaliasdef.c"
index 736b03f406c8b65d300306392d8f317f6b8dd212..b17c0eaa3ad40e6eaefc694a06b5f47ffb706569 100644 (file)
@@ -36,7 +36,6 @@
 #include "gtkimage.h"
 #include "gtkspinner.h"
 #include "gtkstyle.h"
-#include "gtkalias.h"
 
 
 /**
@@ -626,6 +625,3 @@ gtk_spinner_stop (GtkSpinner *spinner)
 
   gtk_spinner_set_active (spinner, FALSE);
 }
-
-#define __GTK_SPINNER_C__
-#include "gtkaliasdef.c"
index 2556c149dddc3b181d276d628da3ca024e31f2ae..3d72d430125f595dd972b057fe746b345ebd9b3e 100644 (file)
@@ -34,7 +34,6 @@
 #include "gtkprivate.h"
 #include "gtkintl.h"
 #include "gtkbuildable.h"
-#include "gtkalias.h"
 
 /**
  * SECTION:gtkstatusbar
@@ -1096,6 +1095,3 @@ label_selectable_changed (GtkWidget  *label,
       statusbar->has_resize_grip && statusbar->grip_window)
     gdk_window_raise (statusbar->grip_window);
 }
-
-#define __GTK_STATUSBAR_C__
-#include "gtkaliasdef.c"
index 8e4ebe633c7b611c5adb0910c86ebaaf578c6bae..049ddf8dbc26b215ccb8dd11aff67084a5b38ba7 100644 (file)
@@ -61,8 +61,6 @@
 
 #include "gdkkeysyms.h"
 
-#include "gtkalias.h"
-
 #define BLINK_TIMEOUT 500
 
 enum
@@ -3060,7 +3058,3 @@ gtk_status_icon_set_name (GtkStatusIcon *status_icon,
 
   g_object_notify (G_OBJECT (status_icon), "name");
 }
-
-
-#define __GTK_STATUS_ICON_C__
-#include "gtkaliasdef.c"
index 21befac32ad648772f99787960fba18b3695c24f..29a57890fafa8f99ca5a7e13d425a0dac5844e3d 100644 (file)
@@ -32,7 +32,6 @@
 #include "gtkiconfactory.h"
 #include "gtkintl.h"
 #include <gdk/gdkkeysyms.h>
-#include "gtkalias.h"
 
 /**
  * SECTION:gtkstock
@@ -553,6 +552,3 @@ init_stock_hash (void)
                                    NULL);
     }
 }
-
-#define __GTK_STOCK_C__
-#include "gtkaliasdef.c"
index 5785081c19048f7fdc32c086c5ed46a3a5563e93..836de8ab2390911ce9d6b1c893c39a4c898c5891 100644 (file)
@@ -39,7 +39,6 @@
 #include "gtkiconfactory.h"
 #include "gtksettings.h"       /* _gtk_settings_parse_convert() */
 #include "gtkintl.h"
-#include "gtkalias.h"
 #include "gtkspinner.h"
 
 
@@ -6305,6 +6304,3 @@ gtk_draw_insertion_cursor (GtkWidget          *widget,
   if (area)
     gdk_gc_set_clip_rectangle (gc, NULL);
 }
-
-#define __GTK_STYLE_C__
-#include "gtkaliasdef.c"
index 22a283836d465dad8719f0dc126640ae681924c8..e7eafef82d977ff17b112ef9e7b845ea4d8933a1 100644 (file)
@@ -28,7 +28,7 @@
 #include "gtktable.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
+
 
 enum
 {
@@ -1639,6 +1639,3 @@ gtk_table_size_allocate_pass2 (GtkTable *table)
        }
     }
 }
-
-#define __GTK_TABLE_C__
-#include "gtkaliasdef.c"
index 8bdb3bebbe63414cf6fd51b86cce00b2068e4703..c64058e3fac85f6e9dfae4bcced81f44d17fbe47 100644 (file)
@@ -29,7 +29,6 @@
 #include "gtkmenu.h"
 #include "gtktearoffmenuitem.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 #define ARROW_SIZE 10
 #define TEAR_LENGTH 5
@@ -250,6 +249,3 @@ gtk_tearoff_menu_item_parent_set (GtkWidget *widget,
                        tearoff_menu_item);
     }  
 }
-
-#define __GTK_TEAROFF_MENU_ITEM_C__
-#include "gtkaliasdef.c"
index dac8f1daec7fad20706604493e0a89e6cd33bb66..e84d487ee0ded8496c7ebce4b110e4fec07001ba 100644 (file)
@@ -22,7 +22,6 @@
 #include "config.h"
 
 #include <gtk/gtk.h>
-#include "gtkalias.h"
 
 #include <locale.h>
 #include <string.h>
@@ -653,6 +652,3 @@ gtk_test_register_all_types (void)
       *tp = 0;
     }
 }
-
-#define __GTK_TEST_UTILS_C__
-#include "gtkaliasdef.c"
index f0cd19ade9478a1183b851e367a7b1836bf43816..0e999e4bc65f9163d260370f021934cffbca35ff 100644 (file)
@@ -64,7 +64,6 @@
 #include "gtktextiterprivate.h"
 #include "gtkdebug.h"
 #include "gtktextmarkprivate.h"
-#include "gtkalias.h"
 
 /*
  * Types
@@ -7289,6 +7288,3 @@ _gtk_text_btree_spew_segment (GtkTextBTree* tree, GtkTextLineSegment * seg)
               seg->body.toggle.info->tag->priority);
     }
 }
-
-#define __GTK_TEXT_BTREE_C__
-#include "gtkaliasdef.c"
index 0caea4f563f8ff4331e991fc2ae1c227a83f1569..2fec1e50fa380c47ac067cfd28d7c253c29b2912 100644 (file)
@@ -40,7 +40,6 @@
 #include "gtktextiterprivate.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 
 #define GTK_TEXT_BUFFER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_TEXT_BUFFER, GtkTextBufferPrivate))
@@ -4399,6 +4398,3 @@ _gtk_text_buffer_spew (GtkTextBuffer *buffer)
 {
   _gtk_text_btree_spew (get_btree (buffer));
 }
-
-#define __GTK_TEXT_BUFFER_C__
-#include "gtkaliasdef.c"
index 16501f768156163669987d39a6bf6ff6f35e0413..8db902f67309e1d60de23ffcbcb232624d1c2f14 100644 (file)
@@ -26,7 +26,6 @@
 #include "gtktextbufferrichtext.h"
 #include "gtktextbufferserialize.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 
 typedef struct
@@ -822,6 +821,3 @@ deserialize_quark (void)
 
   return quark;
 }
-
-#define __GTK_TEXT_BUFFER_RICH_TEXT_C__
-#include "gtkaliasdef.c"
index 1ddb9b0f8134a113e01eebe890b9a35a87d0185d..b6948e9d5d2f34d5ea2f98ffb10169972bf6d972 100644 (file)
@@ -32,7 +32,6 @@
 #include "gdk-pixbuf/gdk-pixdata.h"
 #include "gtktextbufferserialize.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 
 typedef struct
index aaf171576d183f80c85a784f7e892a84fa4cecb4..ad23def3471bd3a15eec88c057a1251c3fa3a3eb 100644 (file)
@@ -53,7 +53,6 @@
 #include "gtktextbtree.h"
 #include "gtktextlayout.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 #define CHECK_IN_BUFFER(anchor)                                         \
   G_STMT_START {                                                        \
@@ -510,6 +509,3 @@ gtk_text_anchored_child_set_layout (GtkWidget     *child,
   
   _gtk_anchored_child_set_layout (child, layout);
 }
-
-#define __GTK_TEXT_CHILD_C__
-#include "gtkaliasdef.c"
index 7f76892a67932417a6952b604f8f434b4d2fafbf..f6f0344bf9565ae8b0082266ae23b99fd2d0e34e 100644 (file)
@@ -78,7 +78,6 @@
 #include "config.h"
 #include "gtktextdisplay.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 /* DO NOT go putting private headers in here. This file should only
  * use the semi-public headers, as with gtktextview.c.
  */
@@ -916,6 +915,3 @@ gtk_text_layout_draw (GtkTextLayout *layout,
 
   g_slist_free (line_list);
 }
-
-#define __GTK_TEXT_DISPLAY_C__
-#include "gtkaliasdef.c"
index c31277105d2930228cec5a4edaa9e989635e5fcc..a4cb91b07b4cfb78f56af98e425101737bba16a9 100644 (file)
@@ -31,7 +31,7 @@
 #include "gtktextiterprivate.h"
 #include "gtkintl.h"
 #include "gtkdebug.h"
-#include "gtkalias.h"
+
 #include <string.h>
 
 
@@ -5584,6 +5584,3 @@ _gtk_text_iter_check (const GtkTextIter *iter)
   if (_gtk_text_line_is_last (real->line, real->tree))
     g_error ("Iterator was on last line (past the end iterator)");
 }
-
-#define __GTK_TEXT_ITER_C__
-#include "gtkaliasdef.c"
index 31139d739e0b148e0cdec2d1dc17e45480213c0b..cf40247b677384752ed7f86085904e8af0b02ed0 100644 (file)
@@ -84,7 +84,6 @@
 #include "gtktextiterprivate.h"
 #include "gtktextutil.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 #include <stdlib.h>
 #include <string.h>
@@ -3721,6 +3720,3 @@ gtk_text_layout_buffer_delete_range (GtkTextBuffer *textbuffer,
 
   gtk_text_layout_update_cursor_line (layout);
 }
-
-#define __GTK_TEXT_LAYOUT_C__
-#include "gtkaliasdef.c"
index e6d59972091af5b27fc0494e434c3f2639d72142..b9fb6377fd88467e7a28ee4d1ec2522b56e1c1dc 100644 (file)
@@ -52,7 +52,7 @@
 #include "gtktextbtree.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
+
 
 static void gtk_text_mark_set_property (GObject         *object,
                                        guint            prop_id,
@@ -490,6 +490,3 @@ mark_segment_check_func (GtkTextLineSegment *seg,
   if (seg->body.mark.line != line)
     g_error ("mark_segment_check_func: seg->body.mark.line bogus");
 }
-
-#define __GTK_TEXT_MARK_C__
-#include "gtkaliasdef.c"
index c4383dc7bcdeb8d701a3ecc828a1bfbee73c7459..dfd7c7e44135a9a32103c801b9a496c327cc9018 100644 (file)
@@ -61,7 +61,6 @@
 #include "gtktextlayout.h"
 #include "gtktextiterprivate.h"
 #include "gtkdebug.h"
-#include "gtkalias.h"
 
 /*
  *--------------------------------------------------------------
@@ -638,6 +637,3 @@ const GtkTextLineSegmentClass gtk_text_toggle_off_type = {
   toggle_segment_line_change_func,                      /* lineChangeFunc */
   _gtk_toggle_segment_check_func                        /* checkFunc */
 };
-
-#define __GTK_TEXT_SEGMENT_C__
-#include "gtkaliasdef.c"
index 56af5a4e4ecec179ba153d8cca031fc1da06edd3..500418c870edeeee2fb84ca2d9d22570718f295d 100644 (file)
@@ -55,7 +55,6 @@
 #include "gtkintl.h"
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
-#include "gtkalias.h"
 
 #include <stdlib.h>
 #include <string.h>
@@ -2352,6 +2351,3 @@ _gtk_text_tag_affects_nonsize_appearance (GtkTextTag *tag)
     tag->bg_full_height_set ||
     tag->pg_bg_color_set;
 }
-
-#define __GTK_TEXT_TAG_C__
-#include "gtkaliasdef.c"
index dd9eea941ed60672f2dc113dd34b48c59e87c529..5b509c4cdf35a3e16375b819e48b6fdb2132b095 100644 (file)
@@ -29,7 +29,6 @@
 #include "gtkmarshalers.h"
 #include "gtktextbuffer.h" /* just for the lame notify_will_remove_tag hack */
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 #include <stdlib.h>
 
@@ -414,6 +413,3 @@ _gtk_text_tag_table_remove_buffer (GtkTextTagTable *table,
   
   table->buffers = g_slist_remove (table->buffers, buffer);
 }
-
-#define __GTK_TEXT_TAG_TABLE_C__
-#include "gtkaliasdef.c"
index 3e72302b61613a69733c1bda36b764f3f6a22a3e..df8f6f5dec7f62e6e36529d6aa3388826146ceef 100644 (file)
@@ -26,7 +26,6 @@
 
 #include "config.h"
 #include "gtktexttypes.h"
-#include "gtkalias.h"
 
 /* These are used to represent embedded non-character objects
  * if you return a string representation of a text buffer
@@ -44,6 +43,3 @@ gtk_text_byte_begins_utf8_char (const gchar *byte)
 {
   return inline_byte_begins_utf8_char (byte);
 }
-
-#define __GTK_TEXT_TYPES_C__
-#include "gtkaliasdef.c"
index 95e9d7dd0a529ec25b122d6f371e96770164aae1..11ec8d2c39b4580c83f1deb7e73d3ab89f98837a 100644 (file)
@@ -35,7 +35,6 @@
 #include "gtktextbuffer.h"
 #include "gtkmenuitem.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 #define DRAG_ICON_MAX_WIDTH 250
 #define DRAG_ICON_MAX_HEIGHT 250
index 6fbeae68cd31535efd5196a4eab2f6bf5f3f0255..850a97ffacb95dad655fe86cb669c988cf7c5cbb 100644 (file)
@@ -48,7 +48,7 @@
 #include "gtkprivate.h"
 #include "gtktextutil.h"
 #include "gtkwindow.h"
-#include "gtkalias.h"
+
 
 /* How scrolling, validation, exposes, etc. work.
  *
@@ -9354,6 +9354,3 @@ gtk_text_view_move_visually (GtkTextView *text_view,
 
   return gtk_text_layout_move_iter_visually (text_view->layout, iter, count);
 }
-
-#define __GTK_TEXT_VIEW_C__
-#include "gtkaliasdef.c"
index d6d9f7940fab50872b388bdb0eb2fe9cdfd7eafd..7a553226b85078ad559385d2822afbb85dc49093 100644 (file)
@@ -33,7 +33,7 @@
 #include "gtkthemes.h"
 #include "gtkrc.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
+
 
 typedef struct _GtkThemeEngineClass GtkThemeEngineClass;
 
@@ -191,6 +191,3 @@ gtk_theme_engine_create_rc_style (GtkThemeEngine *engine)
 
   return engine->create_rc_style ();
 }
-
-#define __GTK_THEMES_C__
-#include "gtkaliasdef.c"
index 5a144bb42d5bdaca6857b210769797808c07dc6f..549d101b439ee6683dd828bfc404acf954ff2de5 100644 (file)
@@ -37,7 +37,6 @@
 #include "gtktogglebutton.h"
 #include "gtkcheckmenuitem.h"
 #include "gtkprivate.h"
-#include "gtkalias.h"
 
 
 /**
@@ -359,6 +358,3 @@ create_menu_item (GtkAction *action)
                       "draw-as-radio", toggle_action->private_data->draw_as_radio,
                       NULL);
 }
-
-#define __GTK_TOGGLE_ACTION_C__
-#include "gtkaliasdef.c"
index 54db87ae057dbb3a3d338d89aea01e1c28d41c75..237a5dc1f75b16499f819712dd68443eb9faaf8d 100644 (file)
@@ -33,7 +33,7 @@
 #include "gtkactivatable.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
+
 
 #define DEFAULT_LEFT_POS  4
 #define DEFAULT_TOP_POS   4
@@ -531,6 +531,3 @@ gtk_toggle_button_update_state (GtkButton *button)
   _gtk_button_set_depressed (button, depressed); 
   gtk_widget_set_state (GTK_WIDGET (toggle_button), new_state);
 }
-
-#define __GTK_TOGGLE_BUTTON_C__
-#include "gtkaliasdef.c"
index bb26802fe253b0d1bfc8aba1bfba442cdd2f37d0..a65fdec52b90a3901b5f0bd679f67d448bd02f04 100644 (file)
@@ -30,7 +30,7 @@
 #include "gtktoggleaction.h"
 #include "gtkactivatable.h"
 #include "gtkprivate.h"
-#include "gtkalias.h"
+
 
 #define MENU_ID "gtk-toggle-tool-button-menu-id"
 
@@ -446,6 +446,3 @@ gtk_toggle_tool_button_get_active (GtkToggleToolButton *button)
 
   return button->priv->active;
 }
-
-#define __GTK_TOGGLE_TOOL_BUTTON_C__
-#include "gtkaliasdef.c"
index 7042d47be03e97d72c9d5b5ab4d5a69811b29ee1..7e2c2325af58484f91a333239024a0096304c918 100644 (file)
@@ -56,7 +56,7 @@
 #include "gtkvbox.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
+
 
 typedef struct _ToolbarContent ToolbarContent;
 
@@ -3678,6 +3678,3 @@ toolbar_rebuild_menu (GtkToolShell *shell)
   
   gtk_widget_queue_resize (GTK_WIDGET (shell));
 }
-
-#define __GTK_TOOLBAR_C__
-#include "gtkaliasdef.c"
index 0e6ae592a96c8dfe2e9bec730b42d707a86ac2f4..a138c478ebc30f523a5eea99f2e7e7866cbae66f 100644 (file)
@@ -34,7 +34,6 @@
 #include "gtktoolbar.h"
 #include "gtkactivatable.h"
 #include "gtkprivate.h"
-#include "gtkalias.h"
 
 #include <string.h>
 
@@ -1291,7 +1290,3 @@ _gtk_tool_button_get_button (GtkToolButton *button)
 
   return button->priv->button;
 }
-
-
-#define __GTK_TOOL_BUTTON_C__
-#include "gtkaliasdef.c"
index eba147a66ffff165cd8b7d0d95481c409b3e8818..38911a0ad0d91fdbc853b2874e7501c9c404339b 100644 (file)
@@ -32,7 +32,7 @@
 #include "gtkintl.h"
 #include "gtkmain.h"
 #include "gtkprivate.h"
-#include "gtkalias.h"
+
 
 /**
  * SECTION:gtktoolitem
@@ -1403,6 +1403,3 @@ gtk_tool_item_toolbar_reconfigured (GtkToolItem *tool_item)
 
   gtk_widget_queue_resize (GTK_WIDGET (tool_item));
 }
-
-#define __GTK_TOOL_ITEM_C__
-#include "gtkaliasdef.c"
index 0107b0f0015aaaff9f85b241571003764964c3cd..4e12a22930fc719ea6bd12f9c1912ceeaac03924 100644 (file)
@@ -29,7 +29,6 @@
 #include <string.h>
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 #define ANIMATION_TIMEOUT        50
 #define ANIMATION_DURATION      (ANIMATION_TIMEOUT * 4)
@@ -2431,7 +2430,3 @@ _gtk_tool_item_group_palette_reconfigured (GtkToolItemGroup *group)
 
   gtk_tool_item_group_header_adjust_style (group);
 }
-
-
-#define __GTK_TOOL_ITEM_GROUP_C__
-#include "gtkaliasdef.c"
index fa37edcc56c733c884e9c3fbada89ee3b9da4f22..529fd9554a9cac4a29674dd1b2b6eb245cfe0825 100644 (file)
@@ -29,7 +29,6 @@
 
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 #define DEFAULT_ICON_SIZE       GTK_ICON_SIZE_SMALL_TOOLBAR
 #define DEFAULT_ORIENTATION     GTK_ORIENTATION_VERTICAL
@@ -1925,7 +1924,3 @@ _gtk_tool_palette_get_size_group (GtkToolPalette *palette)
 
   return palette->priv->text_size_group;
 }
-
-
-#define __GTK_TOOL_PALETTE_C__
-#include "gtkaliasdef.c"
index 11f886ed6c300852fca9f595633d0603a8c1dc4b..5a73c08d3837316967b1e0b49f80ffb7ad0d9d6b 100644 (file)
@@ -24,7 +24,7 @@
 #include "gtktoolshell.h"
 #include "gtkwidget.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
+
 
 /**
  * SECTION:gtktoolshell
@@ -247,6 +247,3 @@ gtk_tool_shell_get_text_size_group (GtkToolShell *shell)
 
   return NULL;
 }
-
-#define __GTK_TOOL_SHELL_C__
-#include "gtkaliasdef.c"
index 67c2f6c9a05c16b88b8cd73bac965aa601b6e2a3..3a50fc05b806cc15e46d6a75e5a921b0f6ff7462 100644 (file)
@@ -33,7 +33,6 @@
 #include "gtkhbox.h"
 #include "gtkalignment.h"
 
-#include "gtkalias.h"
 
 #undef DEBUG_TOOLTIP
 
@@ -1533,7 +1532,3 @@ _gtk_tooltip_handle_event (GdkEvent *event)
        break;
     }
 }
-
-
-#define __GTK_TOOLTIP_C__
-#include "gtkaliasdef.c"
index ae426b3765541a8fbce2099d24c0407d5863a863..f4db5c4d290c2f324a051562c942cf335e8cc2c0 100644 (file)
@@ -29,8 +29,6 @@
 #include "gtkprivate.h"
 #include "gtktrayicon.h"
 
-#include "gtkalias.h"
-
 #include "x11/gdkx.h"
 #include <X11/Xatom.h>
 
@@ -997,7 +995,3 @@ _gtk_tray_icon_get_padding (GtkTrayIcon *icon)
 
   return icon->priv->padding;
 }
-
-#define __GTK_TRAY_ICON_X11_C__
-#include "gtkaliasdef.c"
-
index 282c9640f43d89d2dd7ff37ba6f8037785c8fbde..8e644f32fb5878bd3da56ab01887895d95ac97c6 100644 (file)
@@ -22,7 +22,6 @@
 
 #include "config.h"
 #include "gtktreedatalist.h"
-#include "gtkalias.h"
 #include <string.h>
 
 /* node allocation
index 9a1c87fbea7192ecfebd95a7c7439d411ab319e8..f5f436bf02fe582ec1b87166df705ac5b055f02c 100644 (file)
@@ -21,7 +21,6 @@
 #include <string.h>
 #include "gtktreednd.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 
 /**
@@ -354,6 +353,3 @@ gtk_tree_get_row_drag_data (GtkSelectionData  *selection_data,
   
   return TRUE;
 }
-
-#define __GTK_TREE_DND_C__
-#include "gtkaliasdef.c"
index d9cf4e7b423fa93ce7afd647a001dcbeba517f35..d80ce3a492fa4e04238d63db8836a35bdf03a98c 100644 (file)
@@ -28,7 +28,6 @@
 #include "gtktreeprivate.h"
 #include "gtkmarshalers.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 
 #define INITIALIZE_TREE_ITER(Iter) \
@@ -2190,6 +2189,3 @@ gtk_tree_row_reference_reordered (GObject     *proxy,
 
   gtk_tree_row_ref_reordered ((RowRefList *)g_object_get_data (proxy, ROW_REF_DATA_STRING), path, iter, new_order);
 }
-
-#define __GTK_TREE_MODEL_C__
-#include "gtkaliasdef.c"
index 7e0ec63b105ecdabc1141f6b631cf7d4a68549f3..c60ac06447eebac8d9da14cc879dfcaaf1098f29 100644 (file)
@@ -23,7 +23,6 @@
 #include "gtkintl.h"
 #include "gtktreednd.h"
 #include "gtkprivate.h"
-#include "gtkalias.h"
 #include <string.h>
 
 /* ITER FORMAT:
@@ -3529,6 +3528,3 @@ gtk_tree_model_filter_clear_cache (GtkTreeModelFilter *filter)
     gtk_tree_model_filter_clear_cache_helper (filter,
                                               FILTER_LEVEL (filter->priv->root));
 }
-
-#define __GTK_TREE_MODEL_FILTER_C__
-#include "gtkaliasdef.c"
index 4fe4f3488e5c6e280de93581287c223485831cba..ddb355cc30b8e03c5c57e42995dd62258c131c33 100644 (file)
@@ -47,7 +47,7 @@
 #include "gtkintl.h"
 #include "gtkprivate.h"
 #include "gtktreednd.h"
-#include "gtkalias.h"
+
 
 typedef struct _SortElt SortElt;
 typedef struct _SortLevel SortLevel;
@@ -2519,6 +2519,3 @@ gtk_tree_model_sort_iter_is_valid (GtkTreeModelSort *tree_model_sort,
   return gtk_tree_model_sort_iter_is_valid_helper (iter,
                                                   tree_model_sort->root);
 }
-
-#define __GTK_TREE_MODEL_SORT_C__
-#include "gtkaliasdef.c"
index a99c50beeb2b1877b8eef91f15ba7a30c38174a9..7272f43c82047aa8fb56199fd1480b32f4cf6cef 100644 (file)
@@ -24,7 +24,7 @@
 #include "gtkrbtree.h"
 #include "gtkmarshalers.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
+
 
 static void gtk_tree_selection_finalize          (GObject               *object);
 static gint gtk_tree_selection_real_select_all   (GtkTreeSelection      *selection);
@@ -1466,6 +1466,3 @@ gtk_tree_selection_real_select_node (GtkTreeSelection *selection,
 
   return FALSE;
 }
-
-#define __GTK_TREE_SELECTION_C__
-#include "gtkaliasdef.c"
index 7b0b29cf17bcc403b6a01b8e4243f15bf297ae54..b699f1eca39b798a90263367280044b8579b6bcd 100644 (file)
@@ -22,7 +22,7 @@
 #include "gtktreesortable.h"
 #include "gtkmarshalers.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
+
 
 static void gtk_tree_sortable_base_init (gpointer g_class);
 
@@ -257,6 +257,3 @@ gtk_tree_sortable_has_default_sort_func (GtkTreeSortable *sortable)
   
   return (* iface->has_default_sort_func) (sortable);
 }
-
-#define __GTK_TREE_SORTABLE_C__
-#include "gtkaliasdef.c"
index dd5dce09ad68e06bab28eb015418cb2738dbbc83..4570007018d9b3481074d0ee71140f1d2a621726 100644 (file)
@@ -26,7 +26,7 @@
 #include "gtktreednd.h"
 #include "gtkbuildable.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
+
 
 #define G_NODE(node) ((GNode *)node)
 #define GTK_TREE_STORE_IS_SORTED(tree) (((GtkTreeStore*)(tree))->sort_column_id != GTK_TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID)
@@ -3328,6 +3328,3 @@ gtk_tree_store_buildable_custom_finished (GtkBuildable *buildable,
   g_slist_free (data->items);
   g_slice_free (GSListSubParserData, data);
 }
-
-#define __GTK_TREE_STORE_C__
-#include "gtkaliasdef.c"
index e71e2a4ef571fdaa561793230ccdf667d1697d05..8329753881eb1780f6e7e08eebaa92b64afe4a68 100644 (file)
@@ -44,7 +44,6 @@
 #include "gtktreemodelsort.h"
 #include "gtktooltip.h"
 #include "gtkprivate.h"
-#include "gtkalias.h"
 
 #define GTK_TREE_VIEW_PRIORITY_VALIDATE (GDK_PRIORITY_REDRAW + 5)
 #define GTK_TREE_VIEW_PRIORITY_SCROLL_SYNC (GTK_TREE_VIEW_PRIORITY_VALIDATE + 2)
@@ -15670,6 +15669,3 @@ gtk_tree_view_get_tooltip_column (GtkTreeView *tree_view)
 
   return tree_view->priv->tooltip_column;
 }
-
-#define __GTK_TREE_VIEW_C__
-#include "gtkaliasdef.c"
index 0d953de7af00eeaeffca74d5e485d3f36f881fe4..b0da0ab0fd03a9d27ececf56a51fa1241a2ae5bd 100644 (file)
@@ -31,7 +31,7 @@
 #include "gtkarrow.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
+
 
 enum
 {
@@ -3767,6 +3767,3 @@ gtk_tree_view_column_get_tree_view (GtkTreeViewColumn *tree_column)
 
   return tree_column->tree_view;
 }
-
-#define __GTK_TREE_VIEW_COLUMN_C__
-#include "gtkaliasdef.c"
index e15106e8dcc34e87f749cad63fdc4f63f38bbab1..44aabf843152a7063c14c70c4c345e49d170b250 100644 (file)
@@ -2,7 +2,6 @@
 #undef GTK_DISABLE_DEPRECATED
 #include "gtk.h"
 #include "gtkprivate.h"
-#include "gtkalias.h"
 
 /*** END file-header ***/
 
@@ -34,6 +33,5 @@ GType
 /*** END value-tail ***/
 
 /*** BEGIN file-tail ***/
-#define __GTK_TYPE_BUILTINS_C__
-#include "gtkaliasdef.c"
+
 /*** END file-tail ***/
index b66289d0194b6f87554acbd5e10f5da4317ed04d..1d6f9b44e46e7bf4fde0677cc0567db56ed734d9 100644 (file)
@@ -30,7 +30,7 @@
 #include "gtktypeutils.h"
 #include "gtkobject.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
+
 
 GType
 gtk_identifier_get_type (void)
@@ -45,6 +45,3 @@ gtk_identifier_get_type (void)
 
   return our_type;
 }
-
-#define __GTK_TYPE_UTILS_C__
-#include "gtkaliasdef.c"
index 29d09b2f2dde7615df1bb27ed975552ab222beb9..884e14f8478f4609ad97b8ab70c5971321c5d1f5 100644 (file)
@@ -47,7 +47,6 @@
 #include "gtkuimanager.h"
 #include "gtkwindow.h"
 #include "gtkprivate.h"
-#include "gtkalias.h"
 
 #undef DEBUG_UI_MANAGER
 
@@ -3076,6 +3075,3 @@ gtk_ui_manager_add_ui_from_file (GtkUIManager *self,
 }
 
 #endif
-
-#define __GTK_UI_MANAGER_C__
-#include "gtkaliasdef.c"
index ef8ea6c3528df32b470f5ca8e4e5635781b4bbd0..af098ec4558bec817c21b378c2353583bbb8667a 100644 (file)
@@ -28,7 +28,7 @@
 #include "gtkvbbox.h"
 #include "gtkorientable.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
+
 
 /**
  * SECTION:gtkvbbox
@@ -90,7 +90,3 @@ _gtk_vbutton_box_get_layout_default (void)
 {
   return default_layout_style;
 }
-
-
-#define __GTK_VBBOX_C__
-#include "gtkaliasdef.c"
index d87002699bc119c5f8a313fdffdcf1cbe9907edb..3ab349d4ed9e051094d08c072a88f246d42f941e 100644 (file)
@@ -28,7 +28,7 @@
 
 #include "gtkorientable.h"
 #include "gtkvbox.h"
-#include "gtkalias.h"
+
 
 /**
  * SECTION:gtkvbox
@@ -78,6 +78,3 @@ gtk_vbox_new (gboolean homogeneous,
                        "homogeneous", homogeneous ? TRUE : FALSE,
                        NULL);
 }
-
-#define __GTK_VBOX_C__
-#include "gtkaliasdef.c"
index de16f4260588daf6635a31972c015dded7cbc75b..c3eeeb075aee770c2223fce89f192900d067acb2 100644 (file)
@@ -30,7 +30,7 @@
 #include "gtkintl.h"
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
-#include "gtkalias.h"
+
 
 /**
  * SECTION:gtkviewport
@@ -941,6 +941,3 @@ gtk_viewport_get_height (GtkSizeRequest *widget,
 {
   gtk_viewport_get_size (widget, GTK_ORIENTATION_VERTICAL, minimum_size, natural_size);
 }
-
-#define __GTK_VIEWPORT_C__
-#include "gtkaliasdef.c"
index 4ae0c377babf9e913f5748d9e7e5e9f2f24c28e0..6352b002c99162a85766744759dccd9ced79b3a2 100644 (file)
@@ -34,7 +34,6 @@
 #include "gtktooltip.h"
 #include "gtkintl.h"
 
-#include "gtkalias.h"
 
 /**
  * SECTION:gtkvolumebutton
@@ -186,6 +185,3 @@ cb_value_changed (GtkVolumeButton *button, gdouble value, gpointer user_data)
 {
   gtk_widget_trigger_tooltip_query (GTK_WIDGET (button));
 }
-
-#define __GTK_VOLUME_BUTTON_C__
-#include "gtkaliasdef.c"
index 7b9e38f16a209c2f718fad572712efa02a070f53..1719dfd02f98655f327f7ed04abe93fc137f44fe 100644 (file)
@@ -28,7 +28,7 @@
 
 #include "gtkorientable.h"
 #include "gtkvpaned.h"
-#include "gtkalias.h"
+
 
 /**
  * SECTION:gtkvpaned
@@ -67,6 +67,3 @@ gtk_vpaned_new (void)
 {
   return g_object_new (GTK_TYPE_VPANED, NULL);
 }
-
-#define __GTK_VPANED_C__
-#include "gtkaliasdef.c"
index 5bff897ab41046770c5017fe9052b79f0117e65d..61156a0e5837972b1726a7335834be2e7a5ccc9e 100644 (file)
@@ -28,7 +28,7 @@
 
 #include "gtkorientable.h"
 #include "gtkvruler.h"
-#include "gtkalias.h"
+
 
 /**
  * SECTION:gtkvruler
@@ -78,6 +78,3 @@ gtk_vruler_new (void)
 {
   return g_object_new (GTK_TYPE_VRULER, NULL);
 }
-
-#define __GTK_VRULER_C__
-#include "gtkaliasdef.c"
index a36402b6f978a0bbc64d79e39e33fff185d839b3..d4570f8b0fd74fffc6bce636424f7dadf437ff36 100644 (file)
@@ -31,7 +31,7 @@
 
 #include "gtkvscale.h"
 #include "gtkorientable.h"
-#include "gtkalias.h"
+
 
 /**
  * SECTION:gtkvscale
@@ -129,6 +129,3 @@ gtk_vscale_new_with_range (gdouble min,
 
   return GTK_WIDGET (scale);
 }
-
-#define __GTK_VSCALE_C__
-#include "gtkaliasdef.c"
index 8e87c885eec652f7cab174c33d79b13e7d3b7878..59d0664ae579f12c0b73367f9b73a836447ee783 100644 (file)
@@ -30,7 +30,7 @@
 #include "gtkorientable.h"
 #include "gtkvscrollbar.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
+
 
 /**
  * SECTION:gtkvscrollbar
@@ -79,6 +79,3 @@ gtk_vscrollbar_new (GtkAdjustment *adjustment)
                        "adjustment", adjustment,
                        NULL);
 }
-
-#define __GTK_VSCROLLBAR_C__
-#include "gtkaliasdef.c"
index 77c3f59856fc6a84dc38c5b32293494edff815c8..f2dcf81b70c49c943fa76df2946391d580a2eac7 100644 (file)
@@ -28,7 +28,7 @@
 
 #include "gtkorientable.h"
 #include "gtkvseparator.h"
-#include "gtkalias.h"
+
 
 /**
  * SECTION:gtkvseparator
@@ -67,6 +67,3 @@ gtk_vseparator_new (void)
 {
   return g_object_new (GTK_TYPE_VSEPARATOR, NULL);
 }
-
-#define __GTK_VSEPARATOR_C__
-#include "gtkaliasdef.c"
index d302589a11b9fe4ce5ae6691fcd4e6a6b7649f3e..a7d391bab8ed15c837d1a333c152832f3c9e5295 100644 (file)
@@ -56,7 +56,7 @@
 #include "gtkbuildable.h"
 #include "gtkbuilderprivate.h"
 #include "gtksizerequest.h"
-#include "gtkalias.h"
+
 
 /**
  * SECTION:gtkwidget
@@ -11618,6 +11618,3 @@ gtk_widget_send_focus_change (GtkWidget *widget,
 
   return res;
 }
-
-#define __GTK_WIDGET_C__
-#include "gtkaliasdef.c"
index 242722173be8d5d93f5cc00fc495a8c7777f85d4..6d7be9e1f00f2db89ec4458251720c26aa1bc3ef 100644 (file)
@@ -26,7 +26,6 @@
 
 #include "gtkwin32embed.h"
 
-#include "gtkalias.h"
 
 static guint message_type[GTK_WIN32_EMBED_LAST];
 
index 9c276ea3b49f3a16dbcdc935ddd52d10084dfb44..298c36e7b2cea1773c7ac2258ebcfcb75531850c 100644 (file)
@@ -31,7 +31,6 @@
 #include "gtkintl.h"
 #include "gtkprivate.h"
 
-#include "gtkalias.h"
 
 static void            gtk_win32_embed_widget_realize               (GtkWidget        *widget);
 static void            gtk_win32_embed_widget_unrealize             (GtkWidget        *widget);
@@ -379,6 +378,3 @@ gtk_win32_embed_widget_set_focus (GtkWindow *window,
 
   gdk_window_focus (GTK_WIDGET(window)->window, 0);
 }
-
-#define __GTK_WIN32_EMBED_WIDGET_C__
-#include "gtkaliasdef.c"
index 5ff06123ee8571331f91d268f7340866eaf93357..2d671ab08ce90cbc15a9627c8cf5da6a3581824b 100644 (file)
@@ -27,7 +27,6 @@
 #include "gtkmain.h"
 #include "gtkwindow-decorate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 
 #ifdef DECORATE_WINDOWS
@@ -830,7 +829,3 @@ gtk_decorated_window_move_resize_window (GtkWindow   *window,
                          x, y, width, height);
 }
 #endif
-
-
-#define __GTK_WINDOW_DECORATE_C__
-#include "gtkaliasdef.c"
index 5f1baffad83e63065f9c36f323594c2749e7146a..3d286abfe3bc436a20f43f2bc2f65e160d588086 100644 (file)
@@ -49,7 +49,6 @@
 #include "gtkplug.h"
 #include "gtkbuildable.h"
 #include "gtksizerequest.h"
-#include "gtkalias.h"
 
 #ifdef GDK_WINDOWING_X11
 #include "x11/gdkx.h"
@@ -8810,6 +8809,3 @@ gtk_window_set_default_icon_from_file (const gchar *filename,
 }
 
 #endif
-
-#define __GTK_WINDOW_C__
-#include "gtkaliasdef.c"
index f88c8948e0f2e69130367b47d583e8050798cd13..d5ab3bfff676c11ca099bcccb8d8626e97f467aa 100644 (file)
@@ -23,7 +23,7 @@
 #include "gtkmain.h"
 #include "gtkprivate.h"
 #include "gtkxembed.h"
-#include "gtkalias.h"
+
 
 typedef struct _GtkXEmbedMessage GtkXEmbedMessage;
 
index 73bedddcf07c833a8c120450d598d2a510c846e1..d8830fb2c9982c86be6d37f487f00e25981e7e33 100644 (file)
@@ -85,7 +85,7 @@ gtkbuiltincache.h: gtk-update-icon-cache.exe
 GENERATED = \
        gtktypebuiltins.h gtktypebuiltins.c \
        gtkmarshal.h gtkmarshal.c gtkmarshalers.h gtkmarshalers.c \
-       gtk.def gtkalias.h gtkaliasdef.c gtktypefuncs.c
+       gtk.def gtktypefuncs.c
 
 all :                                          \
        ..\config.h                             \
@@ -567,12 +567,6 @@ gtk.def: gtk.symbols makefile.msc
                -DG_GNUC_MALLOC= -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= -DG_GNUC_NORETURN= \
                -DG_GNUC_PRINTF=;G_GNUC_PRINTF gtk.symbols >> gtk.def
 
-gtkalias.h: gtk.symbols
-       $(PERL) makegtkalias.pl < gtk.symbols > gtkalias.h
-
-gtkaliasdef.c: gtk.symbols
-        $(PERL) makegtkalias.pl -def < gtk.symbols > gtkaliasdef.c
-
 # generate type identifier header (GTK_TYPE_WIDGET_FLAGS)
 # use 'echo' to work around 'command line too long'
 gtktypebuiltins.h: $(gtk_public_h_sources) makefile.msc
diff --git a/gtk/makegtkalias.pl b/gtk/makegtkalias.pl
deleted file mode 100755 (executable)
index 73233da..0000000
+++ /dev/null
@@ -1,145 +0,0 @@
-#!/usr/bin/perl -w
-
-exit 0;
-
-my $do_def = 0;
-
-if (($#ARGV >= 0) && ($ARGV[0] eq "-def")) {
-    shift;
-    $do_def = 1;
-}
-
-print <<EOF;
-/* Generated by makegtkalias.pl */
-
-#ifndef DISABLE_VISIBILITY
-
-#include <glib.h>
-
-#ifdef G_HAVE_GNUC_VISIBILITY
-
-EOF
-
-if ($do_def) {
-    print <<EOF
-#undef IN_FILE
-#define IN_FILE defined
-
-#undef IN_HEADER
-#define IN_HEADER(x) 1
-
-EOF
-} 
-else { 
-    print <<EOF
-#define IN_FILE(x) 1
-#define IN_HEADER defined
-
-EOF
-}
-
-my $in_comment = 0;
-my $in_skipped_section = 0;
-
-while (<>) {
-
-  # ignore empty lines
-  next if /^\s*$/;
-
-  # skip comments
-  if ($_ =~ /^\s*\/\*/)
-  {
-      $in_comment = 1;
-  }
-  
-  if ($in_comment)
-  {
-      if ($_ =~  /\*\/\s$/)
-      {
-         $in_comment = 0;
-      }
-      
-      next;
-  }
-
-  # handle ifdefs
-  if ($_ =~ /^\#endif/)
-  {
-      if (!$in_skipped_section)
-      {
-         print $_;
-      }
-
-      $in_skipped_section = 0;
-
-      next;
-  }
-
-  if ($_ =~ /^\#ifdef\s+(INCLUDE_VARIABLES|ALL_FILES)/)
-  {
-      $in_skipped_section = 1;
-  }
-
-  if ($in_skipped_section)
-  {
-      next;
-  }
-
-  if ($_ =~ /^\#ifn?def\s+G/)
-  {
-      print $_;
-      
-      next;
-  }
-  if ($_ =~ /^\#ifndef\s+_WIN64/)
-  {
-      print $_;
-      
-      next;
-  }
-  if ($_ =~ /^\#if.*(IN_FILE|IN_HEADER)/)
-  {
-      print $_;
-      
-      next;
-  }
-
-  chop;
-  my $str = $_;
-  my @words;
-  my $attributes = "";
-
-  @words = split(/ /, $str);
-  $str = shift(@words);
-  chomp($str);
-  my $alias = "IA__".$str;
-  
-  # Drop any Win32 specific .def file syntax,  but keep attributes
-  foreach $word (@words) {
-      $attributes = "$attributes $word" unless $word eq "PRIVATE";
-  }
-      
-  if (!$do_def) {
-    print <<EOF
-extern __typeof ($str) $alias __attribute((visibility("hidden")))$attributes;
-\#define $str $alias
-
-EOF
-  }
-  else {
-    print <<EOF
-\#undef $str 
-extern __typeof ($str) $str __attribute((alias("$alias"), visibility("default")));
-
-EOF
-  }
-}
-
-print <<EOF;
-#endif /* G_HAVE_GNUC_VISIBILITY */
-#endif /* DISABLE_VISIBILITY */
-EOF
-
-
diff --git a/gtk/pltcheck.sh b/gtk/pltcheck.sh
deleted file mode 100755 (executable)
index d8718ce..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-LANG=C
-
-status=0
-
-if ! which readelf 2>/dev/null >/dev/null; then
-       echo "'readelf' not found; skipping test"
-       exit 0
-fi
-
-for so in .libs/lib*.so; do
-       echo Checking $so for local PLT entries
-       readelf -r $so | grep 'JU\?MP_SLOT' | grep '\<gtk' && status=1
-done
-
-exit $status